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: 16-Jul-2005 18:47:24
Branch: HEAD Handle: 2005071617472400
Modified files:
openpkg-src/popt popt.spec
Log:
switch to the latest version contained in RPM only (although this
means we have to take the large RPM source tarball as the source)
Summary:
Revision Changes Path
1.24 +27 -18 openpkg-src/popt/popt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 popt.spec
--- openpkg-src/popt/popt.spec 12 Jun 2005 14:17:21 -0000 1.23
+++ openpkg-src/popt/popt.spec 16 Jul 2005 16:47:24 -0000 1.24
@@ -22,21 +22,25 @@
## SUCH DAMAGE.
##
+# package versions
+%define V_popt 1.10.1
+%define V_rpm 4.4.2
+
# package information
Name: popt
Summary: Option Parsing Library
-URL: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
+URL: ftp://jbj.org/pub/
Vendor: Eric Troja
Packager: OpenPKG
Distribution: OpenPKG
Class: BASE
Group: System
License: LGPL
-Version: 1.7
-Release: 20050612
+Version: %{V_popt}
+Release: 20050716
# list of sources
-Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-%{version}.tar.gz
+Source0: ftp://jbj.org/pub/rpm-devel/rpm-%{V_rpm}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -58,28 +62,33 @@
%track
prog popt = {
version = %{version}
- url = ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
- regex = popt-(__VER__)\.tar\.gz
+ url = ftp://jbj.org/pub/rpm-devel/
+ regex = rpm-(__VER__)\.tar\.gz
}
%prep
- %setup -q
+ %setup -q -n rpm-%{V_rpm}
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags} -lintl" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-shared \
- --disable-nls
- %{l_make} %{l_mflags -O}
+ ( cd popt
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags} -lintl" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-shared \
+ --with-included-gettext \
+ --disable-nls
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ ( cd popt
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ ) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
