see CHANGELOG for details

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 41917ddbfc9a26efa705934e6b4d23a5b91b8af5..bf9104632b97cf78f4801230cb479c5f8c04843d 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,13 @@
 simplepkg changelog
 ===================
 
+0.6pre23
+========
+
+    - generic.mkSlackBuild:
+      - new section copy_init_scripts
+      - gpg_signature_check: support for [[SIGNING KEY ID]] parameter
+
 0.6pre22
 ========
 

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 6675bd6a371d8b4999b60c5b766b02951165d043..021374dc9fbd17c99052ca6145ee2f7fd115d9ce 100644 (file)
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -1,7 +1,7 @@
 #################################################################
 ## Generic template for SlackBuilds
 ##
-## Version 0.9.7 - Luis ( luis at riseup d0t net)
+## Version 0.9.8 - Luis ( luis at riseup d0t net)
 ##                 Alves ( rudsonalves at yahoo d0t com d0t br )
 #################################################################
 #!/bin/bash
@@ -137,6 +137,8 @@ MD5SUM_URL="$(grep "$SRC[ \t]*$" "$SRC_DIR/$SRC.[[MD5SUM EXTENSION]]" | cut -d "
 # Import minimized signing key from
 if echo [[SIGNING KEY URL]] | grep -q -v "SIGNING KEY URL"; then
   lynx -dump [[SIGNING KEY URL]] | gpg --import || exit $ERROR_GPG
+elif echo [[SIGNING KEY ID]] | grep -q -v "SIGNING KEY ID"; then
+  gpg --recv-keys [[SIGNING KEY ID]] || exit $ERROR_GPG
 else
   gpg --import << EOKEY || exit $ERROR_GPG
 [[SIGNING KEY]]
@@ -270,6 +272,12 @@ if [ -d "$PKG/$PREFIX/info" ]; then
 fi
 </compress_info_files>
 
+<copy_init_scripts> off
+# Copy init scripts
+mkdir -p $PKG/etc/rc.d
+cp $CWD/rc.* $PKG/etc/rc.d/
+</copy_init_scripts>
+
 <install_documentation> off
 # Install documentation
 DOCS="[[DOCUMENTATION FILES]]"

diff --git a/trunk/mkbuild/model.mkbuild b/trunk/mkbuild/model.mkbuild
index 504c38d767822a1748c9880f87e86bace9a0df7c..3dd7b061487456f8b05a46df1fb8e351ef6f2b0a 100644 (file)
--- a/trunk/mkbuild/model.mkbuild
+++ b/trunk/mkbuild/model.mkbuild
@@ -99,6 +99,7 @@
 #[[MD5SUM EXTENSION]]=""
 #[[SIGNING KEY]]=""
 #[[SIGNING KEY URL]]=""
+#[[SIGNING KEY ID]]=""
 #[[CONFIG FILES]]=""
 #[[PATCH URLS]]=""
 [[PATCH FILES]]=""
@@ -138,6 +139,7 @@ off: patch_source
  on: strip_binaries
 off: compress_manpages
 off: compress_info_files
+off: copy_init_scripts
  on: install_documentation
  on: slackdesc
 off: move_config_files

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index f389075debb378371af420b65def6acd87db681a..453cf301840490ba5be04c78caa3b590ab3b5b16 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -18,7 +18,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.6pre22"
+VERSION="0.6pre23"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"