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 10:51:14
Branch: HEAD Handle: 2006062209510607
Modified files:
openpkg-src/apache apache.spec
openpkg-src/apache2 apache2.spec
openpkg-src/gcc3 gcc3.spec
openpkg-src/gcc40 gcc40.spec
openpkg-src/gcc42 gcc42.spec
openpkg-src/lighttpd lighttpd.spec
openpkg-src/mutt mutt.spec
openpkg-src/ngircd ngircd.spec
openpkg-src/openpkg build.sh install.sh rpmmacros
openpkg-src/openssh openssh.spec
Log:
upgrade to the newer world order of %{l_openpkg_release} macro
Summary:
Revision Changes Path
1.336 +4 -4 openpkg-src/apache/apache.spec
1.75 +4 -4 openpkg-src/apache2/apache2.spec
1.5 +4 -4 openpkg-src/gcc3/gcc3.spec
1.45 +4 -4 openpkg-src/gcc40/gcc40.spec
1.24 +4 -4 openpkg-src/gcc42/gcc42.spec
1.24 +4 -4 openpkg-src/lighttpd/lighttpd.spec
1.72 +4 -4 openpkg-src/mutt/mutt.spec
1.8 +4 -4 openpkg-src/ngircd/ngircd.spec
1.4 +2 -1 openpkg-src/openpkg/build.sh
1.11 +2 -1 openpkg-src/openpkg/install.sh
1.77 +1 -1 openpkg-src/openpkg/rpmmacros
1.162 +4 -4 openpkg-src/openssh/openssh.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335 -r1.336 apache.spec
--- openpkg-src/apache/apache.spec 9 Jun 2006 07:43:08 -0000 1.335
+++ openpkg-src/apache/apache.spec 22 Jun 2006 08:51:07 -0000 1.336
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060609
+Release: 20060622
# package options (suexec related)
%option with_suexec yes
@@ -220,8 +220,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl, mm
PreReq: openssl, mm
@@ -501,7 +501,7 @@
%setup -q -c
%patch -p0
%{l_shtool} subst \
- -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \
+ -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%t"}";g' \
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 apache2.spec
--- openpkg-src/apache2/apache2.spec 30 Apr 2006 08:12:12 -0000 1.74
+++ openpkg-src/apache2/apache2.spec 22 Jun 2006 08:51:09 -0000 1.75
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060430
+Release: 20060622
# package options (generic)
%option with_mpm prefork
@@ -71,8 +71,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl, make
-PreReq: OpenPKG, openpkg >= 20040130, perl
+BuildPreReq: OpenPKG, openpkg >= 20060622, perl, make
+PreReq: OpenPKG, openpkg >= 20060622, perl
BuildPreReq: expat, libiconv, db
PreReq: expat, libiconv, db
%if "%{with_mod_deflate}" == "yes"
@@ -134,7 +134,7 @@
%setup -q -c
%patch -p0 -d httpd-%{V_apache}
%{l_shtool} subst \
- -e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%s"});g' \
+ -e 's;(" PLATFORM ");(%{l_openpkg_release -F "OpenPKG/%%t"});g' \
httpd-%{V_apache}/server/core.c
# unpack optional extension modules
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc3/gcc3.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 gcc3.spec
--- openpkg-src/gcc3/gcc3.spec 6 Mar 2006 07:14:05 -0000 1.4
+++ openpkg-src/gcc3/gcc3.spec 22 Jun 2006 08:51:10 -0000 1.5
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20060306
+Release: 20060622
# package options
%option with_cxx yes
@@ -57,8 +57,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_binutils}" == "yes"
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
@@ -93,7 +93,7 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"});' \
+ -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%t"});' \
-e 's;\(bug_report_url\[\] =
"\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
%{l_shtool} subst -v -s \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc40/gcc40.spec
============================================================================
$ cvs diff -u -r1.44 -r1.45 gcc40.spec
--- openpkg-src/gcc40/gcc40.spec 28 May 2006 09:39:15 -0000 1.44
+++ openpkg-src/gcc40/gcc40.spec 22 Jun 2006 08:51:10 -0000 1.45
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20060528
+Release: 20060622
# package options
%option with_cxx yes
@@ -57,8 +57,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_binutils}" == "yes"
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
@@ -97,7 +97,7 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"});' \
+ -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%t"});' \
-e 's;\(bug_report_url\[\] =
"\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
%{l_shtool} subst -v -s \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc42/gcc42.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 gcc42.spec
--- openpkg-src/gcc42/gcc42.spec 18 Jun 2006 07:25:20 -0000 1.23
+++ openpkg-src/gcc42/gcc42.spec 22 Jun 2006 08:51:11 -0000 1.24
@@ -38,7 +38,7 @@
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
-Release: 20060618
+Release: 20060622
# package options
%option with_cxx yes
@@ -58,8 +58,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, flex, bison, texinfo
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make, flex, bison, texinfo
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_binutils}" == "yes"
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
@@ -98,7 +98,7 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"})\2;' \
+ -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%t"})\2;' \
-e 's;\(bug_report_url\[\] =
"\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
if [ ".%{V_comp}" != . ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lighttpd/lighttpd.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 lighttpd.spec
--- openpkg-src/lighttpd/lighttpd.spec 10 Mar 2006 07:43:46 -0000
1.23
+++ openpkg-src/lighttpd/lighttpd.spec 22 Jun 2006 08:51:11 -0000
1.24
@@ -33,7 +33,7 @@
Group: Web
License: MIT-style
Version: 1.4.11
-Release: 20060310
+Release: 20060622
# package options
%option with_fsl yes
@@ -52,8 +52,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make, gcc
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.5.0
PreReq: fsl >= 1.5.0
@@ -149,7 +149,7 @@
# install default configuration
%{l_shtool} install -c -m 640 %{l_value -s -a} \
- -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
+ -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%%t"};' \
%{SOURCE lighttpd.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/lighttpd/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mutt/mutt.spec
============================================================================
$ cvs diff -u -r1.71 -r1.72 mutt.spec
--- openpkg-src/mutt/mutt.spec 25 Feb 2006 18:09:37 -0000 1.71
+++ openpkg-src/mutt/mutt.spec 22 Jun 2006 08:51:12 -0000 1.72
@@ -38,7 +38,7 @@
Group: Mail
License: BSD
Version: %{V_mutt}i
-Release: 20060225
+Release: 20060622
# build options
%option with_comp no
@@ -62,8 +62,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make
+PreReq: OpenPKG, openpkg >= 20060622
BuildPreReq: openssl, libidn, libiconv
PreReq: openssl, libidn, libiconv
%if "%{with_ncurses}" == "yes"
@@ -147,7 +147,7 @@
%endif
%patch -p0 -P 5
%{l_shtool} subst \
- -e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%s"};' \
+ -e 's;\(Mutt/%%s\);\1 %{l_openpkg_release -F "OpenPKG/%%t"};' \
sendlib.c
%build
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ngircd/ngircd.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 ngircd.spec
--- openpkg-src/ngircd/ngircd.spec 1 Jan 2006 13:17:23 -0000 1.7
+++ openpkg-src/ngircd/ngircd.spec 22 Jun 2006 08:51:12 -0000 1.8
@@ -33,7 +33,7 @@
Group: Network
License: GNU
Version: 0.9.2
-Release: 20051016
+Release: 20060622
# package options
%option with_fsl yes
@@ -46,8 +46,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, zlib
-PreReq: OpenPKG, openpkg >= 20040130, zlib
+BuildPreReq: OpenPKG, openpkg >= 20060622, zlib
+PreReq: OpenPKG, openpkg >= 20060622, zlib
%if "%{with_fsl}" == "yes"
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
@@ -95,7 +95,7 @@
$RPM_BUILD_ROOT%{l_prefix}/var/ngircd/log
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
%{l_shtool} echo \
- 'Welcome to ngIRCd (%{l_openpkg_release -F "OpenPKG-%s"})' \
+ 'Welcome to ngIRCd (%{l_openpkg_release -F "OpenPKG-%%t"})' \
>$RPM_BUILD_ROOT%{l_prefix}/etc/ngircd/ngircd.motd
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/build.sh
============================================================================
$ cvs diff -u -r1.3 -r1.4 build.sh
--- openpkg-src/openpkg/build.sh 21 Jun 2006 15:21:04 -0000 1.3
+++ openpkg-src/openpkg/build.sh 22 Jun 2006 08:51:06 -0000 1.4
@@ -48,7 +48,8 @@
# determine OpenPKG distribution URLs (part 2)
case "$url_raw" in
*/SRC ) ;;
- * ) url_src="$url_raw/SRC"; url_upd="$url_raw/UPD" ;;
+ */ ) url_src="${url_raw}SRC"; url_upd="${url_raw}UPD" ;;
+ * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# sanity check usage
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/install.sh
============================================================================
$ cvs diff -u -r1.10 -r1.11 install.sh
--- openpkg-src/openpkg/install.sh 21 Jun 2006 15:21:04 -0000 1.10
+++ openpkg-src/openpkg/install.sh 22 Jun 2006 08:51:06 -0000 1.11
@@ -46,7 +46,8 @@
url_upd=""
case "$url_raw" in
*/SRC ) ;;
- * ) url_src="$url_raw/SRC"; url_upd="$url_raw/UPD" ;;
+ */ ) url_src="${url_raw}SRC"; url_upd="${url_raw}UPD" ;;
+ * ) url_src="${url_raw}/SRC"; url_upd="${url_raw}/UPD" ;;
esac
# determine path to binary RPMs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.76 -r1.77 rpmmacros
--- openpkg-src/openpkg/rpmmacros 22 Jun 2006 07:32:14 -0000 1.76
+++ openpkg-src/openpkg/rpmmacros 22 Jun 2006 08:51:06 -0000 1.77
@@ -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 "%{-F*}"}%{!?-F:-F "OpenPKG-%%t"})
# the OpenPKG OIDs (root is officially registered at IANA)
%l_openpkg_oid 1.3.6.1.4.1.18749
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openssh/openssh.spec
============================================================================
$ cvs diff -u -r1.161 -r1.162 openssh.spec
--- openpkg-src/openssh/openssh.spec 3 Jun 2006 20:08:06 -0000 1.161
+++ openpkg-src/openssh/openssh.spec 22 Jun 2006 08:51:13 -0000 1.162
@@ -41,7 +41,7 @@
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
-Release: 20060603
+Release: 20060622
# package options
%option with_fsl yes
@@ -80,8 +80,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, perl
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, perl
+PreReq: OpenPKG, openpkg >= 20060622
BuildPreReq: openssl, zlib
PreReq: openssl, zlib
%if "%{with_pam}" == "yes"
@@ -151,7 +151,7 @@
%endif
%patch -p0 -P 0
%{l_shtool} subst \
- -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
+ -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%%t"};' \
version.h
%if "%{with_chroot}" == "yes"
%patch -p0 -P 1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
