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 08:44:30
Branch: HEAD Handle: 2005072607442900
Modified files:
openpkg-src/popt popt.spec
Log:
there is a dedicated POPT tarball again, so use this one and upgrade
the package
Summary:
Revision Changes Path
1.26 +20 -24 openpkg-src/popt/popt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 popt.spec
--- openpkg-src/popt/popt.spec 17 Jul 2005 08:44:32 -0000 1.25
+++ openpkg-src/popt/popt.spec 26 Jul 2005 06:44:29 -0000 1.26
@@ -23,8 +23,8 @@
##
# package versions
-%define V_popt 1.10.1
-%define V_rpm 4.4.2
+%define V_rpm 4.4.x
+%define V_popt 1.10.2
# package information
Name: popt
@@ -37,10 +37,10 @@
Group: System
License: LGPL
Version: %{V_popt}
-Release: 20050717
+Release: 20050726
# list of sources
-Source0: ftp://jbj.org/pub/rpm-devel/rpm-%{V_rpm}.tar.gz
+Source0: ftp://jbj.org/pub/rpm-%{V_rpm}/popt-%{V_popt}.tar.gz
# build information
Prefix: %{l_prefix}
@@ -61,34 +61,30 @@
%track
prog popt = {
- version = %{V_rpm}
- url = ftp://jbj.org/pub/rpm-devel/
- regex = rpm-(__VER__)\.tar\.gz
+ version = %{V_popt}
+ url = ftp://jbj.org/pub/rpm-%{V_rpm}/
+ regex = popt-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n rpm-%{V_rpm}
+ %setup -q
%build
- ( 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 $?
+ 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}
%install
rm -rf $RPM_BUILD_ROOT
- ( 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_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{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
