OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Aug-2003 09:53:54
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082308535400
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec
Log:
no need AFAIK to build BeeCrypt with thread support; fix the plain
rpmpopt file installation
Summary:
Revision Changes Path
1.192.2.7 +4 -1 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.6 -r1.192.2.7 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Aug 2003 18:55:47 -0000 1.192.2.6
+++ openpkg-src/openpkg/openpkg.spec 23 Aug 2003 07:53:54 -0000 1.192.2.7
@@ -433,6 +433,7 @@
CFLAGS="-O" \
./configure \
--prefix=%{l_prefix} \
+ --disable-threads \
--disable-shared
${l_make} || exit $?
cp .libs/libbeecrypt.a .
@@ -475,7 +476,7 @@
-e 's;LDFLAGS_STATIC="[^"]*";LDFLAGS_STATIC="";g' \
-e "s;SYSCONFIGDIR=.*;SYSCONFIGDIR='%{l_prefix}/etc/openpkg';" \
-e 's;db-[0-9][0-9.]*;db;g' \
- -e 's;/rpmpopt-${VERSION};/rpmpopt;' \
+ -e 's;/rpmpopt-${VERSION};/rpmpopt;g' \
<configure >configure.n && \
mv configure.n configure
sed -e 's;@INTLLIBS@;@INTLLIBS@ @LIBMISC@;' \
@@ -486,6 +487,8 @@
-e 's;$(varprefix)/lib/rpm;$(varprefix)/openpkg;' \
-e 's;$(libdir)/rpm;$(libdir)/openpkg;' \
-e 's;/lib/rpm;/lib/openpkg;' \
+ -e 's;rpmpopt-$(VERSION):;rpmpopt-dummy;' \
+ -e 's;rpmpopt-$(VERSION);rpmpopt;g' \
<Makefile.in >Makefile.in.n && \
mv Makefile.in.n Makefile.in
sed -e 's;/lib/rpm;/lib/openpkg;' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
