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: 22-Aug-2003 20:34:47
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082219344600
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec
Log:
add back more accidently removed patches I'd already applied; remove
some obsoleted stuff; remove warning about config.rpath stuff
Summary:
Revision Changes Path
1.192.2.4 +8 -11 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.3 -r1.192.2.4 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Aug 2003 16:37:09 -0000 1.192.2.3
+++ openpkg-src/openpkg/openpkg.spec 22 Aug 2003 18:34:46 -0000 1.192.2.4
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030822
+%define V_openpkg 20030822
# the used software versions
%define V_rpm 4.2.1
@@ -427,12 +427,14 @@
${l_make} CC="${l_cc}" CFLAGS="-O" libz.a || exit $?
) || exit $?
- # build BEECRYPT library
+ # build BeeCrypt library
( cd beecrypt-%{V_beecrypt}
- CC="${l_cc}" CFLAGS="-O" ./configure \
+ CC="${l_cc}" \
+ CFLAGS="-O" \
+ ./configure \
--prefix=%{l_prefix} \
--disable-shared
- ${l_make} CC="${l_cc}" CFLAGS="-O" || exit $?
+ ${l_make} || exit $?
cp .libs/libbeecrypt.a .
) || exit $?
@@ -480,7 +482,6 @@
mv tools/Makefile.in.n tools/Makefile.in
sed -e 's;^\(SUBDIRS[ ]*=.*\) po \(.*\)$;\1 \2;' \
-e 's;^\(SUBDIRS[ ]*=.*\) tools \(.*\)$;\1 \2;' \
- -e 's;^\(LIBS[ ]*=\).*;\1 @LIBS@ $(EXTRA_LIBS);' \
-e 's;$(varprefix)/lib/rpm;$(varprefix)/openpkg;' \
-e 's;$(libdir)/rpm;$(libdir)/openpkg;' \
-e 's;/lib/rpm;/lib/openpkg;' \
@@ -514,6 +515,7 @@
echo "ac_cv_path___MKDIR=%{l_prefix}/lib/openpkg/shtool mkdir -f -p -m 755}"
echo "ac_cv_path___PYTHON=true"
echo "ac_cv_path___DOXYGEN=true"
+ echo "acl_cv_rpath=no"
) >config.cache
mkdir perl >/dev/null 2>&1 || true
touch perl/Makefile.in
@@ -523,11 +525,6 @@
# kill linux-preconfigured db header, the makefile will symlink the
# header that is configured for the current system
rm rpmdb/db.h
- case `sh ./config.guess` in
- *-*-linux* ) nlsopt="--disable-nls" ;;
- * ) nlsopt="--enable-nls --with-included-gettext" ;;
- esac
- nlsopt="--disable-nls"
CC="${l_cc} -DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
CFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
CPPFLAGS="-DOPENPKG -I$br/zlib-%{V_zlib} -I$br/bzip2-%{V_bzip2}
-I$br/beecrypt-%{V_beecrypt}" \
@@ -542,7 +539,7 @@
--with-glob \
--without-python \
--without-apidocs \
- $nlsopt
+ --disable-nls
${l_make}
) || exit $?
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
