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: 10-Aug-2006 21:30:31
Branch: HEAD Handle: 2006081020302902
Modified files:
openpkg-src/clamav clamav.spec
openpkg-src/curl curl.spec
openpkg-src/lftp lftp.spec
openpkg-src/libedit libedit.spec
openpkg-src/m4 m4.spec
Removed files:
openpkg-src/m4 m4.1
Log:
Workaround datarootdir problems: man/ and info/ would be placed under
share/ (recently introduced with GNU autoconf 2.60)
Summary:
Revision Changes Path
1.65 +2 -1 openpkg-src/clamav/clamav.spec
1.84 +2 -1 openpkg-src/curl/curl.spec
1.99 +1 -0 openpkg-src/lftp/lftp.spec
1.24 +2 -1 openpkg-src/libedit/libedit.spec
1.2 +0 -122 openpkg-src/m4/m4.1
1.39 +3 -11 openpkg-src/m4/m4.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/clamav/clamav.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 clamav.spec
--- openpkg-src/clamav/clamav.spec 9 Aug 2006 16:15:23 -0000 1.64
+++ openpkg-src/clamav/clamav.spec 10 Aug 2006 19:30:30 -0000 1.65
@@ -33,7 +33,7 @@
Group: Filesystem
License: GPL
Version: 0.88.4
-Release: 20060809
+Release: 20060810
# list of sources
Source0:
http://switch.dl.sourceforge.net/clamav/clamav-%{version}.tar.gz
@@ -77,6 +77,7 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc/clamav \
--with-zlib=%{l_prefix} \
--with-libcurl \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/curl/curl.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 curl.spec
--- openpkg-src/curl/curl.spec 7 Aug 2006 17:51:31 -0000 1.83
+++ openpkg-src/curl/curl.spec 10 Aug 2006 19:30:29 -0000 1.84
@@ -33,7 +33,7 @@
Group: Web
License: MIT-style
Version: 7.15.5
-Release: 20060807
+Release: 20060810
# package options
%option with_ssl yes
@@ -102,6 +102,7 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --datarootdir=%{l_prefix} \
%if "%{with_ssl}" == "yes"
--with-ssl=%{l_prefix} \
--with-ca-bundle=%{l_prefix}/etc/curl/ca-bundle.crt \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lftp/lftp.spec
============================================================================
$ cvs diff -u -r1.98 -r1.99 lftp.spec
--- openpkg-src/lftp/lftp.spec 10 Aug 2006 18:32:49 -0000 1.98
+++ openpkg-src/lftp/lftp.spec 10 Aug 2006 19:30:30 -0000 1.99
@@ -74,6 +74,7 @@
./configure \
--srcdir=$srcdir \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc/lftp \
--without-included-readline \
--with-openssl=%{l_prefix} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libedit/libedit.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 libedit.spec
--- openpkg-src/libedit/libedit.spec 4 Jun 2006 13:50:17 -0000 1.23
+++ openpkg-src/libedit/libedit.spec 10 Aug 2006 19:30:31 -0000 1.24
@@ -37,7 +37,7 @@
Group: Terminal
License: BSD
Version: %{V_main}.%{V_snap}
-Release: 20060604
+Release: 20060810
# list of sources
Source0:
http://www.thrysoee.dk/editline/libedit-%{V_snap}-%{V_main}.tar.gz
@@ -74,6 +74,7 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --datarootdir=%{l_prefix} \
--disable-shared
%{l_make} %{l_mflags}
@@ .
rm -f openpkg-src/m4/m4.1 <<'@@ .'
Index: openpkg-src/m4/m4.1
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/m4/m4.spec
============================================================================
$ cvs diff -u -r1.38 -r1.39 m4.spec
--- openpkg-src/m4/m4.spec 16 Jul 2006 07:25:05 -0000 1.38
+++ openpkg-src/m4/m4.spec 10 Aug 2006 19:30:29 -0000 1.39
@@ -33,11 +33,10 @@
Group: Language
License: GPL
Version: 1.4.5
-Release: 20060716
+Release: 20060810
# list of sources
Source0: ftp://ftp.gnu.org/gnu/m4/m4-%{version}.tar.gz
-Source1: m4.1
# build information
Prefix: %{l_prefix}
@@ -70,6 +69,7 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --datarootdir=%{l_prefix} \
--disable-nls
# build package
@@ -79,15 +79,7 @@
rm -rf $RPM_BUILD_ROOT
# install package
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
-
- # install local manual page
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -m 644 \
- %{SOURCE m4.1} $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
# provide alternative GNU names
ln $RPM_BUILD_ROOT%{l_prefix}/bin/m4 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
