[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Sep-2007 17:33:53
Branch: HEAD Handle: 2007090916335200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
print entire list of all %NoSource files instead of bailing out on the
first missing file encountered
Summary:
RevisionChanges Path
1.473 +1 -0 openpkg-src/openpkg/HISTORY
1.608 +1 -1 openpkg-src/openpkg/openpkg.spec
1.83+1 -1 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.472 -r1.473 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Aug 2007 12:29:48 - 1.472
+++ openpkg-src/openpkg/HISTORY 9 Sep 2007 15:33:52 - 1.473
@@ -2,6 +2,7 @@
2007
+20070909 print entire list of all %NoSource files instead of bailing out on
the first missing file encountered
20070321 upgrade to openpkg-registry 1.1.3 remove legacy code which had the
side effect of the REGISTRY_UUID file being touched hourly
20070718 "diff reduction" to RPM 5 development version (no functional change)
20070717 fix a very long-standing cruel implementation bug in the platform
detection
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.607 -r1.608 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Aug 2007 12:29:48 - 1.607
+++ openpkg-src/openpkg/openpkg.spec 9 Sep 2007 15:33:52 - 1.608
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070824
+%define V_openpkg 20070909
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.82 -r1.83 rpmmacros
--- openpkg-src/openpkg/rpmmacros 19 Apr 2007 10:41:52 - 1.82
+++ openpkg-src/openpkg/rpmmacros 9 Sep 2007 15:33:52 - 1.83
@@ -333,7 +333,7 @@
%integrity() %{l_check_nosource}
# macros for checking build environment
-%l_check_nosource() %(%{l_sane_env}; for url in . %{?_restricted}; do [
".$url" = .. ] && continue; eval `echo "$url" | sed -e
's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1 --> \\"; file=\\"\\2\\"!' -e
's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\"; file=\\"\\2\\"!' -e
's:^\\([^;].*\\)$:;url="(from unknown location) "; file="\\1":' -e 's:^;::'`;
if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file" ]; then echo
"set +x"; ( echo "Sorry, this OpenPKG package contains a DISTRIBUTION
RESTRICTED source file."; echo "Before you can proceed building this package
you have to MANUALLY fetch"; echo "${url}${file}"; echo "and provide it
locally under the path"; echo "%{_sourcedir}/$file" ) | %{l_rpmtool} msg -b
-t error | sed -e 's;^;echo ";' -e 's;$;";'; echo "exit 1"; fi; done)
+%l_check_nosource() %(%{l_sane_env}; checkok=1; checkinfo=`echo "Sorry,
this OpenPKG package contains a DISTRIBUTION RESTRICTED source file."; echo
"Before you can proceed building this package, fetch missing files MANUALLY:"`;
for url in . %{?_restricted}; do [ ".$url" = .. ] && continue; eval `echo
"$url" | sed -e 's!^\\(.*\\)::/\\([^/][^/]*\\)$!;url=\\"\\1\\";
file=\\"\\2\\"!' -e 's!^\\([^:;][^:]*://.*/\\)\\([^/][^/]*\\)$!;url=\\"\\1\\";
file=\\"\\2\\"!' -e 's:^\\([^;].*\\)$:;url="(unknown location) "; file="\\1":'
-e 's:^;::'`; if [ ! -f "%{_specdir}/$file" ] && [ ! -f "%{_sourcedir}/$file"
]; then checkok=0; checkinfo=`echo "${checkinfo}"; echo ""; echo "from ${url}";
echo "file ${file}"; echo "here %{_sourcedir}/$file"`; fi; done; if [ $checkok
-ne 1 ]; then echo "set +x"; echo "$checkinfo" | %{l_rpmtool} msg -b -t error |
sed -e 's;^;echo ";' -e 's;$;";'; echo "exit 1"; fi)
%l_check_class() %(%{l_sane_env}; class=`echo
"@:%{?class}:%{?distribution}" | sed -e 's;^@:\\([^:][^:]*\\):.*$;\\1;' -e
's;^@:.*\\[\\(.*\\)\\].*$;\\1;' -e 's;^@:.*$;JUNK;'`; %{l_rpmtool} check-class
"$class")
%prep %%prep\
%{l_check_nosource} \
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 14-Nov-2006 09:33:30
Branch: HEAD Handle: 2006111408332900
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
provide %{l_miniperl} and %{l_openssl} macros
Summary:
RevisionChanges Path
1.399 +1 -0 openpkg-src/openpkg/HISTORY
1.545 +1 -1 openpkg-src/openpkg/openpkg.spec
1.80+2 -0 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.398 -r1.399 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Nov 2006 21:01:02 - 1.398
+++ openpkg-src/openpkg/HISTORY 14 Nov 2006 08:33:29 - 1.399
@@ -2,6 +2,7 @@
2006
+20061114 provide %{l_miniperl} and %{l_openssl} macros
20061112 install zlib's zconf.h header as it is required by zlib.h
20061030 upgrade to cURL 7.16.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.544 -r1.545 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 12 Nov 2006 21:01:02 - 1.544
+++ openpkg-src/openpkg/openpkg.spec 14 Nov 2006 08:33:29 - 1.545
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20061112
+%define V_openpkg 20061114
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.79 -r1.80 rpmmacros
--- openpkg-src/openpkg/rpmmacros 13 Oct 2006 19:48:13 - 1.79
+++ openpkg-src/openpkg/rpmmacros 14 Nov 2006 08:33:29 - 1.80
@@ -263,6 +263,8 @@
%l_flex %{l_tool_locate flex flex}
%l_bison %{l_tool_locate bisonbison}
%l_perl %{l_tool_locate perl perl}
+%l_miniperl %{l_tool_locate miniperl miniperl}
+%l_openssl %{l_tool_locate openssl openssl}
%l_xmkmf %{l_tool_locate xmkmfxmkmf}
%l_vcheck%{l_tool_locate vcheck vcheck}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 22-Jun-2006 09:32:17
Branch: HEAD Handle: 2006062208321301
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
do not rely on the smartness of RPM to not expand "%x" when we
actually meant "%%x"
Summary:
RevisionChanges Path
1.340 +1 -0 openpkg-src/openpkg/HISTORY
1.493 +1 -1 openpkg-src/openpkg/openpkg.spec
1.76+5 -5 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.339 -r1.340 HISTORY
--- openpkg-src/openpkg/HISTORY 21 Jun 2006 15:21:04 - 1.339
+++ openpkg-src/openpkg/HISTORY 22 Jun 2006 07:32:13 - 1.340
@@ -2,6 +2,7 @@
2006
+20060622 do not rely on RPM's smartness to not expand "%x" when we actually
meant "%%x"
20060621 use new "openpkg release" for "openpkg install" and "openpkg build"
commands
20060621 use new "openpkg release" for %{l_openpkg_release} macro
20060621 added "openpkg release" command for more precise OpenPKG
distribution tag and URL determination
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.492 -r1.493 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 21 Jun 2006 15:21:04 - 1.492
+++ openpkg-src/openpkg/openpkg.spec 22 Jun 2006 07:32:13 - 1.493
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060621
+%define V_openpkg 20060622
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.75 -r1.76 rpmmacros
--- openpkg-src/openpkg/rpmmacros 21 Jun 2006 15:21:05 - 1.75
+++ openpkg-src/openpkg/rpmmacros 22 Jun 2006 07:32:14 - 1.76
@@ -26,7 +26,7 @@
##
# the OpenPKG release identification (for the current package or as a
fallback for the bootstrap package)
-%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release="%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}"
%{?-F:-F "%(echo "%{-F*}" | sed -e 's/%s/%t/g')"}%{!?-F:-F "OpenPKG-%t"})
+%l_openpkg_release(F:) %(%{l_prefix}/libexec/openpkg/release
--release="%{?release}%{!?release:%(%{l_rpm} -q --qf '%{release}' openpkg)}"
%{?-F:-F "%(echo "%{-F*}" | sed -e 's/%%s/%%t/g')"}%{!?-F:-F "OpenPKG-%%t"})
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ -42,8 +42,8 @@
%l_tag_fmt_opt %(uuid_ns="`%{l_uuid} -v3 ns:OID
%{l_openpkg_oid_tagfmtopt}`"; %{l_uuid} -v3 $uuid_ns '%{?_options}')
%l_tag_fmt_uuid %(%{l_uuid} -v1)
%l_tag_fmt_time %(date '+%%Y%%m%%d%%H%%M%%S')
-%l_tag_fmt_user %(%{l_shtool} echo -e '%u')
-%l_tag_fmt_host %(%{l_shtool} echo -e '%h%d')
+%l_tag_fmt_user %(%{l_shtool} echo -e '%%u')
+%l_tag_fmt_host %(%{l_shtool} echo -e '%%h%%d')
%l_tag_gen %{expand:%(echo '%{l_tag_fmt}' | sed -e
's/<\\([a-zA-Z][_a-zA-Z0-9]*\\)>/%%{l_tag_fmt_\\1}/g')}
%l_tag %(echo "%{l_tag_gen}" | sed -e 's;-;;g')
@@ -281,9 +281,9 @@
%l_whoami%((id -un) 2>/dev/null || (whoami) 2>/dev/null ||
(who am i | cut "-d " -f1) 2>/dev/null || echo $LOGNAME)
# macros for dynamically generating a %files list
-%l_files_defattr '%defattr(-,%{l_musr},%{l_mgrp})'
+%l_files_defattr '%%defattr(-,%{l_musr},%{l_mgrp})'
%l_files_all '%{l_prefix}'
-%l_files_noshared'%not %dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
+%l_files_noshared'%%not %%dir
{%{l_prefix},%{l_prefix}/*,%{l_prefix}/etc/rc.d,%{l_prefix}/man/*}'
%l_files_std() %l_files_defattr %l_files_all %l_files_noshared
# path to local build root
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 18-Jun-2006 22:06:25
Branch: HEAD Handle: 2006061821061904
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
- support bootstrap "Release:" tags for N-STABLE branches ("N.YYYMMDD")
- support bootstrap "Release:" tags like MMDD for variants of
external parties
Summary:
RevisionChanges Path
1.336 +2 -0 openpkg-src/openpkg/HISTORY
1.489 +1 -1 openpkg-src/openpkg/openpkg.spec
1.74+1 -1 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.335 -r1.336 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Jun 2006 19:18:06 - 1.335
+++ openpkg-src/openpkg/HISTORY 18 Jun 2006 20:06:19 - 1.336
@@ -2,6 +2,8 @@
2006
+20060618 support bootstrap "Release:" tags for N-STABLE branches
("N.YYYMMDD")
+20060618 support bootstrap "Release:" tags like MMDD for variants of
external parties
20060612 upgrade to cURL 7.15.4
20060523 force OpenSSL to build with just platform "cc" for maximum
portability
20060517 make "openpkg uuid update" processing more robust to prevent
problems
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.488 -r1.489 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 12 Jun 2006 19:18:07 - 1.488
+++ openpkg-src/openpkg/openpkg.spec 18 Jun 2006 20:06:22 - 1.489
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20060612
+%define V_openpkg 20060618
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.73 -r1.74 rpmmacros
--- openpkg-src/openpkg/rpmmacros 1 Jan 2006 13:17:53 - 1.73
+++ openpkg-src/openpkg/rpmmacros 18 Jun 2006 20:06:23 - 1.74
@@ -26,7 +26,7 @@
##
# the OpenPKG release identification (for the current package or as a
fallback for the bootstrap package)
-%l_openpkg_release(F:) %(echo "%{?release}%{!?release:%(%{l_rpm} -q --qf
'%{release}' openpkg)}" | sed -e 's;^;X;' -e
's;^X\\([0-9][0-9]*\\.[0-9][0-9]*\\).*$;\\1;' -e
's;^X\\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\\)$;CURRENT;' -e
's;^X.*$;UNKNOWN;' | awk '{ printf(%{?-F:%{-F*}}%{!?-F:"OpenPKG-%s"}, $0); }')
+%l_openpkg_release(F:) %(echo "%{?release}%{!?release:%(%{l_rpm} -q --qf
'%{release}' openpkg)}" | sed -e 's;^;X;' -e
's;^X\\([0-9][0-9]*\\.[0-9][0-9]*\\).*$;\\1;' -e
's;^X\\([0-9][0-9]*\\.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\\).*$;STABLE;'
-e 's;^X\\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]\\).*$;CURRENT;' -e
's;^X.*$;UNKNOWN;' | awk '{ printf(%{?-F:%{-F*}}%{!?-F:"OpenPKG-%s"}, $0); }')
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Aug-2005 22:47:23
Branch: HEAD Handle: 2005081221472200
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
improvements handling the recently introduced l_ar, l_ld and l_strip
variables
Summary:
RevisionChanges Path
1.286 +2 -0 openpkg-src/openpkg/HISTORY
1.440 +15 -12 openpkg-src/openpkg/openpkg.spec
1.71+3 -2 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.285 -r1.286 HISTORY
--- openpkg-src/openpkg/HISTORY 9 Aug 2005 08:13:51 - 1.285
+++ openpkg-src/openpkg/HISTORY 12 Aug 2005 20:47:22 - 1.286
@@ -2,6 +2,8 @@
2005
+20050812 use ls(1) as a better strip(1) replacement as both fail when a file
is missing
+20050812 store l_ar, l_ld and l_strip in .buildenv, reorder rpmmacros and
introduce l_strip
20050808 make sure strip(1) logic does not break shell script execution
20050804 temporary workaround defeating problems with Fedora Core 4 vendor
compiler
20050727 remove dependency to binutils tools size(1) and strip(1)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.439 -r1.440 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 9 Aug 2005 08:13:51 - 1.439
+++ openpkg-src/openpkg/openpkg.spec 12 Aug 2005 20:47:22 - 1.440
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050809
+%define V_openpkg 20050812
# the used software versions
%define V_rpm 4.2.1
@@ -271,7 +271,7 @@
fi
echo "l_tar=\"$l_tar\"; export l_tar" >>.buildenv
-# manually make sure make(1) is available
+# manually make sure make(1L) is available
l_make=""; [ ".%{?l_make:set}" = .set ] && l_make="%{l_make}"; export
l_make
if [ ".$l_make" = . ]; then
l_make=`sh $shtool path gmake make`
@@ -302,6 +302,7 @@
exit 1
fi
fi
+echo "l_ar=\"$l_ar\"; export l_ar" >>.buildenv
# manually make sure ld(1) is available
l_ld=""; [ ".%{?l_ld:set}" = .set ] && l_ld="%{l_ld}"; export l_ld
@@ -312,6 +313,18 @@
exit 1
fi
fi
+echo "l_ld=\"$l_ld\"; export l_ld" >>.buildenv
+
+# manually make sure strip(1) is available or use a null replacement
+l_strip=""; [ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}";
export l_strip
+if [ ".$l_strip" = . ]; then
+l_strip=`sh $shtool path strip ls`
+if [ ".$l_strip" = . ]; then
+echo "openpkg: prerequisite tool \`strip' not found"
+exit 1
+fi
+fi
+echo "l_strip=\"$l_strip\"; export l_strip" >>.buildenv
# determine path to aux.usrgrp.sh script
usrgrp=`SOURCE aux.usrgrp.sh`
@@ -848,16 +861,6 @@
# display verbosity header
set +x; VERBOSE "INSTALL: Stripping Down Installation"; set -x
-# manually make sure strip(1) is available or use a null replacement
-l_strip=""; [ ".%{?l_strip:set}" = .set ] && l_strip="%{l_strip}";
export l_strip
-if [ ".$l_strip" = . ]; then
-l_strip=`sh $shtool path strip || true`
-if [ ".$l_strip" = . ]; then
-echo "openpkg: prerequisite tool \`strip' not found - using null
replacement"
-l_strip="echo"
-fi
-fi
-
# strip RPM installation
${l_strip} $RPM_BUILD_ROOT%{l_prefix}/bin/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/* >/dev/null 2>&1 || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.70 -r1.71 rpmmacros
--- openpkg-src/openpkg/rpmmacros 26 Jul 2005 07:24:56 - 1.70
+++ openpkg-src/openpkg/rpmmacros 12 Aug 2005 20:47:22 - 1.71
@@ -247,11 +247,12 @@
%l_gzip %{l_tool_locate gzip gzip}
%l_bzip2 %{l_tool_locate bzip2bzip2}
%l_tar %{l_tool_locate tar tar}
+%l_make %{l_tool_locate make make}
+%l_cc%{l_tool_locate cc cc}
%l_ar%{l_tool_locate ar ar
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 26-Jul-2005 09:24:57
Branch: HEAD Handle: 2005072608245600
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
Add %{l_ar} and %{l_ld} macros for easier bootstrapping
Summary:
RevisionChanges Path
1.278 +1 -0 openpkg-src/openpkg/HISTORY
1.435 +1 -1 openpkg-src/openpkg/openpkg.spec
1.70+2 -0 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.277 -r1.278 HISTORY
--- openpkg-src/openpkg/HISTORY 24 Jul 2005 18:10:51 - 1.277
+++ openpkg-src/openpkg/HISTORY 26 Jul 2005 07:24:56 - 1.278
@@ -2,6 +2,7 @@
2005
+20050726 Add %{l_ar} and %{l_ld} macros for easier bootstrapping
20050624 "better" patch for GNU gzip, OpenPKG-SA-2005.009 (CAN-2005-1228)
20050722 Upgraded to Zlib 1.2.3
20050706 Fixed zlib security issue (OpenPKG-SA-2005.013, CAN-2005-2096)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.434 -r1.435 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 24 Jul 2005 18:10:51 - 1.434
+++ openpkg-src/openpkg/openpkg.spec 26 Jul 2005 07:24:56 - 1.435
@@ -38,7 +38,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20050724
+%define V_openpkg 20050726
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.69 -r1.70 rpmmacros
--- openpkg-src/openpkg/rpmmacros 24 Mar 2005 11:19:44 - 1.69
+++ openpkg-src/openpkg/rpmmacros 26 Jul 2005 07:24:56 - 1.70
@@ -247,6 +247,8 @@
%l_gzip %{l_tool_locate gzip gzip}
%l_bzip2 %{l_tool_locate bzip2bzip2}
%l_tar %{l_tool_locate tar tar}
+%l_ar%{l_tool_locate ar ar}
+%l_ld%{l_tool_locate ld ld}
%l_cc%{l_tool_locate cc cc}
%l_cxx %{l_tool_locate cxx c++}
%l_make %{l_tool_locate make make}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY openpkg.spec rpmmacros
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: 02-Jun-2004 17:43:06
Branch: HEAD Handle: 2004060216430501
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmmacros
Log:
Evil hack to workaround build problems under Debian (at least 3.1)
(and derived platforms) where a Debian install-info(8) exists which is
both API and functionally incompatible to the de-facto standardized
install-info(8) command from GNU Texinfo.
ATTENTION: THIS SHOULD BE REPLACED ASAP WITH A MORE GENERIC BUILD
COMMAND OVERRIDE SOLUTION! This solution was just hacked in as a cruel
workaround in order to already get OpenPKG 2.1 running out-of-the-box
under Debian 3.1-PRE because it is the preferred bleeding-edge platform
of one of our beloved project stakeholders ;-) So, for god's sake...
Summary:
RevisionChanges Path
1.185 +1 -0 openpkg-src/openpkg/HISTORY
1.337 +21 -0 openpkg-src/openpkg/openpkg.spec
1.64+1 -1 openpkg-src/openpkg/rpmmacros
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
$ cvs diff -u -r1.184 -r1.185 HISTORY
--- openpkg-src/openpkg/HISTORY 2 Jun 2004 08:52:59 - 1.184
+++ openpkg-src/openpkg/HISTORY 2 Jun 2004 15:43:05 - 1.185
@@ -2,6 +2,7 @@
2004
+20040602 add evil hack to workaround Debian 3.1 install-info(8) conflicts
20040602 remove unused code from run-command processor
20040602 prevent gcc 2.95 from optimizing RPM DB's sha1.c and run into a virtual
memory exhaustion situation
20040601 fixate path to GnuPG, because RPM 4.2 passes argument directly to execve(2)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
$ cvs diff -u -r1.336 -r1.337 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 2 Jun 2004 08:28:22 - 1.336
+++ openpkg-src/openpkg/openpkg.spec 2 Jun 2004 15:43:05 - 1.337
@@ -1867,6 +1867,27 @@
) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t warn
fi
+# FIXME: Evil hack to workaround build problems under Debian
+# (at least 3.1) (and similar platforms) where a Debian
+# install-info(8) exists which is both API and functionally
+# incompatible to the de-facto standardized install-info(8)
+# command from GNU Texinfo. ATTENTION: THIS SHOULD BE REPLACED
+# ASAP WITH A MORE GENERIC BUILD COMMAND OVERRIDE SOLUTION!
+case "`cat %{l_prefix}/etc/openpkg/platform`" in
+*-*-debian* )
+if [ ! -d %{l_prefix}/lib/openpkg/override ]; then
+mkdir %{l_prefix}/lib/openpkg/override >/dev/null 2>&1 || true
+fi
+if [ ! -f %{l_prefix}/lib/openpkg/override/install-info ]; then
+( echo "#!/bin/sh"
+ echo "echo 'OpenPKG: NOTICE: install-info(8) command execution
overridden'"
+ echo "exit 0"
+) >%{l_prefix}/lib/openpkg/override/install-info
+chmod 775 %{l_prefix}/lib/openpkg/override/install-info
+fi
+;;
+esac
+
%preun
[ ".$1" != .0 ] && exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
$ cvs diff -u -r1.63 -r1.64 rpmmacros
--- openpkg-src/openpkg/rpmmacros 1 Jun 2004 15:08:26 - 1.63
+++ openpkg-src/openpkg/rpmmacros 2 Jun 2004 15:43:06 - 1.64
@@ -358,7 +358,7 @@
%l_fetch_backup_9ftp://ftp.openpkg.org/sources/DST/%{name}/
# sane build environment setup
-%l_build_path%{l_prefix}/bin:%{l_prefix}/sbin:@l_build_path@
+%l_build_path%(if [ -d %{l_prefix}/lib/openpkg/override ]; then echo
"%{l_prefix}/lib/openpkg/override:"; fi)%{l_prefix}/bin:%{l_prefix}/sbin:@l_build_path@
%l_build_ldlp%{l_prefix}/lib:@l_build_ldlp@
%l_build_ulim@l_build_ulim@
%l_build_shell_cmd %{l_prefix}/lib/openpkg/bash
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
