From: Pekka Riikonen <priikone@silcnet.org>
Date: Fri, 1 Jun 2007 05:36:24 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: autodist.1.3.2~1
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=d5f94892022c08288de68e7d43bce74f184edf34

	updates.
---

diff --git a/README.DIST b/README.DIST
index a2942501..cfd1d98f 100644
--- a/README.DIST
+++ b/README.DIST
@@ -29,6 +29,14 @@ major.minor.build, for example 0.9.10.  Example:
 This prepares 'client' distribution of version 0.9.15.  The package will 
 have the version 0.9.15 automatically.
 
+NOTE: Those distribution that have RPM spec files you should specify the 
+RPM release version to autodist also by doing the following:
+
+	autodist toolkit 1.1.2 0.fc7
+
+where the "0.fc7" will become the RPM release version.  If you omit the 
+release version the default currently is "0.fc7".
+
 
 Configuring and compiling the distribution
 ==========================================
diff --git a/apps/autodist/autodist.spec.in b/apps/autodist/autodist.spec.in
index 4455daaa..cd2bb3f3 100644
--- a/apps/autodist/autodist.spec.in
+++ b/apps/autodist/autodist.spec.in
@@ -38,14 +38,6 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/autodist/COPYING
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/install-info %{_infodir}/autodist.info %{_infodir}/dir || :
-
-%prerun
-if [ "$1" = 0 ]; then
-    /sbin/install-info --del %{_infodir}/autodist.info %{_infodir}/dir || :
-fi
-
 %files
 %defattr(-, root, root, -)
 %{_bindir}/*
diff --git a/distdir/autodist b/distdir/autodist
index 672b82e9..475a3f6f 100644
--- a/distdir/autodist
+++ b/distdir/autodist
@@ -1,6 +1,7 @@
 name SILC Autodist
 package autodist
 bug-report autodist-bugs@silcnet.org
+prereq 1.3.2
 
 license apps/autodist/COPYING
 license-header distdir/GPL-header distdir/BSD-header
diff --git a/distdir/autodist-post-process-dist b/distdir/autodist-post-process-dist
index 1d17dbfd..768ce026 100644
--- a/distdir/autodist-post-process-dist
+++ b/distdir/autodist-post-process-dist
@@ -13,6 +13,11 @@ if test -d $distdir; then
   rm -rf `find $distdir -name Makefile`
 fi
 
-sed -e "s/AUTODIST_VERSION/$dist_version/" apps/autodist/autodist.spec.in \
-  > $distdir/autodist.spec
+release=$5
+if test -z $release; then
+  release="0.fc7"
+fi
+
+sed -e "s/AUTODIST_VERSION/$dist_version/" -e "s/AUTODIST_RELEASE/$release/" \
+  apps/autodist/autodist.spec.in > $distdir/autodist.spec
 
diff --git a/distdir/pre-dist-toolkit b/distdir/pre-dist-toolkit
index 4f5641b1..12d05fd4 100644
--- a/distdir/pre-dist-toolkit
+++ b/distdir/pre-dist-toolkit
@@ -4,8 +4,14 @@ distribution=$1
 dist_version=$2
 package=$3
 distdir=$4
+release=$5
 
-sed -e "s/SILC_VERSION/$dist_version/" silc-toolkit.spec.in > silc-toolkit.spec
+if test -z $release; then
+  release="0.fc7"
+fi
+
+sed -e "s/SILC_VERSION/$dist_version/" -e "s/SILC_RELEASE/$release/" \
+  silc-toolkit.spec.in > silc-toolkit.spec
 
 ./configure
 
diff --git a/distdir/toolkit b/distdir/toolkit
index 17c80c94..ddbb2732 100644
--- a/distdir/toolkit
+++ b/distdir/toolkit
@@ -1,6 +1,7 @@
 name Toolkit
 package silc-toolkit
 bug-report silc-devel@lists.silcnet.org
+prereq 1.3.2
 
 # Inherits
 inherit common
diff --git a/silc-toolkit.spec.in b/silc-toolkit.spec.in
index f819953b..a59ee1c6 100644
--- a/silc-toolkit.spec.in
+++ b/silc-toolkit.spec.in
@@ -1,7 +1,7 @@
 Summary: SILC Toolkit
 Name: silc-toolkit
 Version: SILC_VERSION
-Release: 0.fc6
+Release: SILC_RELEASE
 License: GPL/BSD dual licensed
 Group: System Environment/Libraries
 URL: http://silcnet.org/