OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 11-Jul-2007 14:04:23
Branch: HEAD Handle: 2007071113042300
Modified files:
openpkg-src/autoconf autoconf.spec
Log:
cleanup packaging
Summary:
Revision Changes Path
1.58 +24 -11 openpkg-src/autoconf/autoconf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/autoconf/autoconf.spec
============================================================================
$ cvs diff -u -r1.57 -r1.58 autoconf.spec
--- openpkg-src/autoconf/autoconf.spec 1 Jan 2007 17:36:41 -0000
1.57
+++ openpkg-src/autoconf/autoconf.spec 11 Jul 2007 12:04:23 -0000
1.58
@@ -23,9 +23,12 @@
##
# version numbers
-%define V_latest 2.61
-%define V_older 2.59
-%define V_ancient 2.13
+%define V_latest 2.61
+%define V_latest_comp 261
+%define V_older 2.59
+%define V_older_comp 259
+%define V_ancient 2.13
+%define V_ancient_comp 213
# package information
Name: autoconf
@@ -38,7 +41,7 @@
Group: Building
License: GPL
Version: %{V_latest}
-Release: 20061118
+Release: 20070711
# list of sources
Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz
@@ -88,9 +91,9 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
- --program-suffix=-213
+ --program-suffix="-%{V_ancient_comp}"
%{l_shtool} subst \
- -e 's;\(acdatadir = $(datadir)/autoconf\);\1/213;' \
+ -e 's;\(acdatadir = $(datadir)/autoconf\);\1/%{V_ancient_comp};' \
Makefile
%{l_make} %{l_mflags}
) || exit $?
@@ -100,6 +103,9 @@
%{l_shtool} subst \
-e 's;^\(PACKAGE_STRING=.GNU Autoconf [0-9.]*\)\(.\);\1
(%{l_openpkg_release})\2;g' \
configure
+ %{l_shtool} subst \
+ -e 's;^\(pkgdatadir.=..(datadir)\)/@PACKAGE@;\1;' \
+ Makefile.in */Makefile.in */*/Makefile.in
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
ACLOCAL=true \
@@ -110,8 +116,8 @@
GREP=grep \
./configure \
--prefix=%{l_prefix} \
- --datadir=%{l_prefix}/share/autoconf/259 \
- --program-suffix=-259
+ --datadir=%{l_prefix}/share/autoconf/%{V_older_comp} \
+ --program-suffix="-%{V_older_comp}"
%{l_make} %{l_mflags}
) || exit $?
@@ -120,6 +126,9 @@
%{l_shtool} subst \
-e 's;^\(PACKAGE_STRING=.GNU Autoconf [0-9.]*\)\(.\);\1
(%{l_openpkg_release})\2;g' \
configure
+ %{l_shtool} subst \
+ -e 's;^\(pkgdatadir.=..(datadir)\)/@PACKAGE@;\1;' \
+ Makefile.in */Makefile.in */*/Makefile.in
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
ACLOCAL=true \
@@ -131,6 +140,7 @@
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+ --datadir=%{l_prefix}/share/autoconf/%{V_latest_comp} \
--infodir=%{l_prefix}/info
%{l_make} %{l_mflags}
) || exit $?
@@ -143,22 +153,25 @@
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix}
mv $RPM_BUILD_ROOT%{l_prefix}/info/autoconf.info \
- $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-213.info
+ $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-%{V_ancient_comp}.info
) || exit $?
# configure and build Autoconf (older version)
( cd autoconf-%{V_older}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
- datadir=$RPM_BUILD_ROOT%{l_prefix}/share/autoconf/259
+ datadir=$RPM_BUILD_ROOT%{l_prefix}/share/autoconf/%{V_older_comp} \
+ mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
+ infodir=$RPM_BUILD_ROOT%{l_prefix}/info
mv $RPM_BUILD_ROOT%{l_prefix}/info/autoconf.info \
- $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-259.info
+ $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-%{V_older_comp}.info
) || exit $?
# configure and build Autoconf (current version)
( cd autoconf-%{V_latest}
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ datadir=$RPM_BUILD_ROOT%{l_prefix}/share/autoconf/%{V_latest_comp}
\
mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
infodir=$RPM_BUILD_ROOT%{l_prefix}/info
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
