diff options
| author | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-26 16:11:57 +0000 |
|---|---|---|
| committer | rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58> | 2008-12-26 16:11:57 +0000 |
| commit | e063ca0c27e120c24479b927b573f70ae7712528 (patch) | |
| tree | 8f19399388b8f1423a2d308dc20fc76eba25fa4d | |
| parent | aa0893f4fcc3e706cabab4af6ac3c322447d092f (diff) | |
| download | simplepkg-e063ca0c27e120c24479b927b573f70ae7712528.tar.gz simplepkg-e063ca0c27e120c24479b927b573f70ae7712528.tar.bz2 | |
minor changes
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@719 04377dda-e619-0410-9926-eae83683ac58
| -rw-r--r-- | trunk/doc/CHANGELOG | 4 | ||||
| -rw-r--r-- | trunk/mkbuild/kde4.mkSlackBuild | 10 | ||||
| -rwxr-xr-x | trunk/src/mkbuild | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG index 391b011..744ee03 100644 --- 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 5211bda..0e34547 100644 --- 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 8917974..73cc144 100755 --- 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 |