minor changes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@719 04377dda-e619-0410-9926-eae83683ac58

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 391b011653f07046d1cad9b124f4f627a8cc0e35..744ee038447778dc06187040cfce4b8f92e459fc 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -36,9 +36,9 @@ simplepkg changelog
       - some svn check routines extended for git
     - perl.mkSlackBuild
        - added sections copy_init_scripts and copy_config_files
-    - generic.mkSlackBuild and per.mkSlackBuild
+    - generic.mkSlackBuild, perl.mkSlackBuild and kde4.mkSlackBuild
       - clean_builds now compliant with standard --cleanup behaviour
-      - new section slack-required
+      - new section slack-required, download_patches, manifest_check
     - generic.mkSlackBuild:
       - config() on postinstall_script now accepting .dist and .sample config file extensions
       - added git_source section

diff --git a/trunk/mkbuild/kde4.mkSlackBuild b/trunk/mkbuild/kde4.mkSlackBuild
index 5211bdacecc6ac83224bca5542e08b2dffb1498e..0e34547787db6af292d08a93bf81ebe18c5ed3fb 100644 (file)
--- a/trunk/mkbuild/kde4.mkSlackBuild
+++ b/trunk/mkbuild/kde4.mkSlackBuild
@@ -487,6 +487,14 @@ mkuser() {
 EOSCRIPT
 </postinstall_script>
 
+<slack_required> off
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+</slack_required>
+
 <build_package> off
 # Build the package
 cd "$PKG"
@@ -495,7 +503,7 @@ makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERRO
 
 <clean_builds> off
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
 </clean_builds>

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 89179746b11745e98a98a672c5e3fc21c1a06b62..73cc144e3c0895c125a5e9fdb9f9a25ccdfc0a27 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -857,7 +857,7 @@ function edit_manifest {
 
   # Update patches
   for i in `find $WORK | grep -E '(.diff$|.diff.gz$|.diff.bz2$|.patch$|.patch.gz$|.patch.bz2$)\*{0,1}$'`; do
-    if [ ! -d "$WORK/$i" ]; then
+    if [ ! -d "$WORK/$i" ] && ! grep -q -e "^PATCH `basename $i` " $WORK/Manifest; then
       update_manifest_info $i patch
     fi
   done