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 openpkg-web Date: 12-Sep-2003 12:09:48
Branch: HEAD Handle: 2003091211094602
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
openpkg-web news.txt
Log:
1. do not remove the builded sources in %clean to be consistent with
other OpenPKG packages. Just a minor thing.
2. include all essential RPM C API headers in <prefix>/include/rpm/,
plus glob.h from misc/. And install libmisc.a from misc/ as
<prefix>/lib/librpmmisc.a. This all together should allow us
to build RPM API based packages like APT, etc.
3. add file(1) magic* files to <prefix>/lib/openpkg/. This should
allow RPM to correctly determine the commands for %setup even
if the file extensions do not allow such determination.
Summary:
Revision Changes Path
1.45 +3 -0 openpkg-src/openpkg/HISTORY
1.215 +26 -3 openpkg-src/openpkg/openpkg.spec
1.6528 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.44 -r1.45 HISTORY
--- openpkg-src/openpkg/HISTORY 11 Sep 2003 19:15:30 -0000 1.44
+++ openpkg-src/openpkg/HISTORY 12 Sep 2003 10:09:48 -0000 1.45
@@ -2,6 +2,9 @@
2003
====
+20030912 do not remove the builded sources in %clean to be consistent with other
OpenPKG packages
+20030912 include all essential RPM C API headers in <prefix>/include/rpm/
+20030912 add file(1) magic* files to <prefix>/lib/openpkg/
20030911 disable RPM internal support for unzip(1)'ing .zip files
20030911 improve Linux detection in "platform" script
20030909 remove one more GCC extensional feature (in RPM's file/file.h)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.214 -r1.215 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 11 Sep 2003 18:03:16 -0000 1.214
+++ openpkg-src/openpkg/openpkg.spec 12 Sep 2003 10:09:48 -0000 1.215
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20030911
+%define V_openpkg 20030912
# the used software versions
%define V_rpm 4.2.1
@@ -679,6 +679,8 @@
VERBOSE "INSTALL: Install Additional Files"
# add additional development files
+ cp rpm-%{V_rpm}/misc/glob.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
+ cp rpm-%{V_rpm}/misc/libmisc.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmmisc.a
cp zlib-%{V_zlib}/zlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
cp zlib-%{V_zlib}/libz.a $RPM_BUILD_ROOT%{l_prefix}/lib/librpmz.a
cp bzip2-%{V_bzip2}/bzlib.h $RPM_BUILD_ROOT%{l_prefix}/include/rpm/
@@ -727,7 +729,7 @@
l_cflags=""
l_cppflags="-DOPENPKG -I${l_prefix}/include/rpm -I${l_prefix}/include"
l_ldflags="-L${l_prefix}/lib"
- l_libs="-lrpmbuild -lrpm -lrpmio -lrpmpopt -lrpmbeecrypt -lrpmdb -lrpmbz2
-lrpmz"
+ l_libs="-lrpmbuild -lrpm -lrpmio -lrpmpopt -lrpmmisc -lrpmbeecrypt -lrpmdb
-lrpmbz2 -lrpmz"
sed -e "s:@l_prefix@:%{l_prefix}:g" \
-e "s:@l_cc@:$l_cc:g" \
-e "s:@l_cflags@:$l_cflags:g" \
@@ -907,20 +909,37 @@
%{l_prefix}/etc/openpkg/openpkg.pgp
%dir %{l_prefix}/include
%dir %{l_prefix}/include/rpm
+ %{l_prefix}/include/rpm/argv.h
%{l_prefix}/include/rpm/beecrypt.h
%{l_prefix}/include/rpm/bzlib.h
%{l_prefix}/include/rpm/db.h
+ %{l_prefix}/include/rpm/fts.h
+ %{l_prefix}/include/rpm/glob.h
+ %{l_prefix}/include/rpm/hdrinline.h
%{l_prefix}/include/rpm/header.h
%{l_prefix}/include/rpm/misc.h
%{l_prefix}/include/rpm/popt.h
+ %{l_prefix}/include/rpm/rpmal.h
%{l_prefix}/include/rpm/rpmbuild.h
+ %{l_prefix}/include/rpm/rpmcli.h
+ %{l_prefix}/include/rpm/rpmdb.h
+ %{l_prefix}/include/rpm/rpmds.h
%{l_prefix}/include/rpm/rpmerr.h
+ %{l_prefix}/include/rpm/rpmfc.h
+ %{l_prefix}/include/rpm/rpmfi.h
+ %{l_prefix}/include/rpm/rpmfile.h
+ %{l_prefix}/include/rpm/rpmhash.h
%{l_prefix}/include/rpm/rpmio.h
%{l_prefix}/include/rpm/rpmlib.h
%{l_prefix}/include/rpm/rpmlog.h
%{l_prefix}/include/rpm/rpmmacro.h
%{l_prefix}/include/rpm/rpmmessages.h
+ %{l_prefix}/include/rpm/rpmpgp.h
+ %{l_prefix}/include/rpm/rpmps.h
%{l_prefix}/include/rpm/rpmspec.h
+ %{l_prefix}/include/rpm/rpmsw.h
+ %{l_prefix}/include/rpm/rpmte.h
+ %{l_prefix}/include/rpm/rpmts.h
%{l_prefix}/include/rpm/rpmurl.h
%{l_prefix}/include/rpm/stringbuf.h
%{l_prefix}/include/rpm/ugid.h
@@ -936,6 +955,10 @@
%{l_prefix}/lib/openpkg/file
%{l_prefix}/lib/openpkg/gzip
%{l_prefix}/lib/openpkg/macros
+ %{l_prefix}/lib/openpkg/magic
+ %{l_prefix}/lib/openpkg/magic.mgc
+ %{l_prefix}/lib/openpkg/magic.mime
+ %{l_prefix}/lib/openpkg/magic.mime.mgc
%{l_prefix}/lib/openpkg/mkproxyrpm.pl
%{l_prefix}/lib/openpkg/patch
%{l_prefix}/lib/openpkg/platform
@@ -964,6 +987,7 @@
%{l_prefix}/lib/librpmbz2.a
%{l_prefix}/lib/librpmdb.a
%{l_prefix}/lib/librpmio.a
+ %{l_prefix}/lib/librpmmisc.a
%{l_prefix}/lib/librpmpopt.a
%{l_prefix}/lib/librpmz.a
%dir %{l_prefix}/libexec
@@ -1033,7 +1057,6 @@
# cleanup after building
rm -rf $RPM_BUILD_ROOT
- rm -rf openpkg-%{version}
%pre
# always performed for upgrades and because it doesn't harm!
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6527 -r1.6528 news.txt
--- openpkg-web/news.txt 12 Sep 2003 10:04:12 -0000 1.6527
+++ openpkg-web/news.txt 12 Sep 2003 10:09:46 -0000 1.6528
@@ -1,3 +1,4 @@
+12-Sep-2003: Upgraded package: P<openpkg-20030912-20030912>
12-Sep-2003: Upgraded package: P<wine-20030911-20030912>
12-Sep-2003: Upgraded package: P<vim-6.2.90-20030912>
12-Sep-2003: Upgraded package: P<pgadmin-0.9.3.20030912-20030912>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
