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 14:14:36
Branch: OPENPKG_UPGRADE_RPM42 Handle: 2003082313143600
Modified files: (Branch: OPENPKG_UPGRADE_RPM42)
openpkg-src/openpkg openpkg.spec rpmmacros
Log:
remove check-files (it is not portable at all) and set a few more
(now) needed macros
Summary:
Revision Changes Path
1.192.2.10 +1 -2 openpkg-src/openpkg/openpkg.spec
1.40.2.1 +13 -0 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.192.2.9 -r1.192.2.10 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 23 Aug 2003 11:17:11 -0000 1.192.2.9
+++ openpkg-src/openpkg/openpkg.spec 23 Aug 2003 12:14:36 -0000 1.192.2.10
@@ -613,7 +613,7 @@
find-prov.pl find-lang.sh cpanflute convertrpmrc.sh check-prereqs \
rpmputtext rpmgettext brp-compress brp-redhat brp-sparc64-linux \
brp-strip brp-strip-shared brp-strip-comment-note rpmrc \
- config.guess config.sub; do
+ config.guess config.sub check-files; do
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file >/dev/null 2>&1 || true
done
@@ -815,7 +815,6 @@
%{l_prefix}/lib/openpkg/bash
%{l_prefix}/lib/openpkg/bzip2
%{l_prefix}/lib/openpkg/curl
- %{l_prefix}/lib/openpkg/check-files
%{l_prefix}/lib/openpkg/find-provides
%{l_prefix}/lib/openpkg/find-requires
%{l_prefix}/lib/openpkg/gzip
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.40 -r1.40.2.1 rpmmacros
--- openpkg-src/openpkg/rpmmacros 17 Jul 2003 09:35:15 -0000 1.40
+++ openpkg-src/openpkg/rpmmacros 23 Aug 2003 12:14:36 -0000 1.40.2.1
@@ -106,6 +106,8 @@
%_specdir %{l_root_rpm}/SRC/%{name}
%_rpmdir %{l_root_rpm}/PKG
%_srcrpmdir %{l_root_rpm}/PKG
+%_repackage_dir %{l_root_rpm}/PKG
+%_cache_dbpath %{l_root_rpm}/PKG
%_defaultdocdir %{l_docdir}
# complement the %{SOURCE<n>} and %{PATCH<n>} with %{SOURCE <file>} and %{PATCH
<file>}
@@ -139,12 +141,19 @@
%__sed sed
%__ssh ssh
%__tar %{_tarbin}
+%__unzip %{_unzipbin}
+
+# override some more RPM macros where the default value is not acceptable
+%_dependency_whiteout %{nil}
+%__debug_install_post %{nil}
+%_unpackaged_files_terminate_build 0
# provide fixed paths to tools (standard)
%_gzipbin %{l_prefix}/lib/openpkg/gzip
%_bzip2bin %{l_prefix}/lib/openpkg/bzip2
%_patchbin %{l_prefix}/lib/openpkg/patch
%_tarbin %{l_prefix}/lib/openpkg/tar
+%_unzipbin %{l_prefix}/lib/openpkg/unzip
# provide fixed paths to tools (additional)
%l_rc %{l_prefix}/etc/rc
@@ -206,6 +215,8 @@
# override the name scheme for RPM files
%_rpmfilename [EMAIL PROTECTED]@.rpm
+%_build_name_fmt [EMAIL PROTECTED]@.rpm
+%_repackage_name_fmt [EMAIL PROTECTED]@.rpm
# override the payload compression for the CPIO parts of an RPM
# (we use the equivalent of "bzip2 -9")
@@ -213,7 +224,9 @@
%_binary_payload w9.bzdio
# package signature type is OpenPGP via GnuPG
+%__gpg gpg
%_signature gpg
+%__vsflags 1
# two macro-processor add-ons (should be part of forthcoming RPM releases)
%ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
