projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb52ad6
)
updates.
author
Pekka Riikonen
<priikone@silcnet.org>
Fri, 1 Jun 2007 05:36:24 +0000
(
05:36
+0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Fri, 1 Jun 2007 05:36:24 +0000
(
05:36
+0000)
README.DIST
patch
|
blob
|
history
apps/autodist/autodist.spec.in
patch
|
blob
|
history
distdir/autodist
patch
|
blob
|
history
distdir/autodist-post-process-dist
patch
|
blob
|
history
distdir/pre-dist-toolkit
patch
|
blob
|
history
distdir/toolkit
patch
|
blob
|
history
silc-toolkit.spec.in
patch
|
blob
|
history
diff --git
a/README.DIST
b/README.DIST
index a2942501957a1ad683e1075c92767649e319006a..cfd1d98f92404ab9f5ceb4b916c0972860b6125e 100644
(file)
--- 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.
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
==========================================
Configuring and compiling the distribution
==========================================
diff --git
a/apps/autodist/autodist.spec.in
b/apps/autodist/autodist.spec.in
index 4455daaa8704841c597003c91d16dfe01e6c9860..cd2bb3f31008fcda26b5e6fb8884369b3982f579 100644
(file)
--- 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
%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}/*
%files
%defattr(-, root, root, -)
%{_bindir}/*
diff --git
a/distdir/autodist
b/distdir/autodist
index 672b82e96ebff6232fa84e796f0fd0bf29f7b3a9..475a3f6fbd169554a24f8cab717ff378432e29ef 100644
(file)
--- a/
distdir/autodist
+++ b/
distdir/autodist
@@
-1,6
+1,7
@@
name SILC Autodist
package autodist
bug-report autodist-bugs@silcnet.org
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
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 1d17dbfd67776c2d2d9eb0d2199c06a998e8d467..768ce026439c13682ba4ebb9495492047c42031d 100644
(file)
--- 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
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 4f5641b10cac2fde3dc60b591df2060740f246eb..12d05fd464a1ae6a23ced79c25e1b936f0caae78 100644
(file)
--- a/
distdir/pre-dist-toolkit
+++ b/
distdir/pre-dist-toolkit
@@
-4,8
+4,14
@@
distribution=$1
dist_version=$2
package=$3
distdir=$4
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
./configure
diff --git
a/distdir/toolkit
b/distdir/toolkit
index 17c80c94f76da77b00acd862d66d7f4b2203af39..ddbb2732082757d3af3dc39ba7775fbe31dccc19 100644
(file)
--- a/
distdir/toolkit
+++ b/
distdir/toolkit
@@
-1,6
+1,7
@@
name Toolkit
package silc-toolkit
bug-report silc-devel@lists.silcnet.org
name Toolkit
package silc-toolkit
bug-report silc-devel@lists.silcnet.org
+prereq 1.3.2
# Inherits
inherit common
# Inherits
inherit common
diff --git
a/silc-toolkit.spec.in
b/silc-toolkit.spec.in
index f819953bc02082dfb3149470d40bd7df806453f6..a59ee1c63c013a46e1db1851aa85cb8d3b1a83ed 100644
(file)
--- a/
silc-toolkit.spec.in
+++ b/
silc-toolkit.spec.in
@@
-1,7
+1,7
@@
Summary: SILC Toolkit
Name: silc-toolkit
Version: SILC_VERSION
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/
License: GPL/BSD dual licensed
Group: System Environment/Libraries
URL: http://silcnet.org/