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-Aug-2006 16:17:22
Branch: HEAD Handle: 2006082615172200
Modified files:
openpkg-src/png png.spec
Log:
repackage PMG with its new GNU autoconf based build environment
Summary:
Revision Changes Path
1.53 +16 -24 openpkg-src/png/png.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/png/png.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 png.spec
--- openpkg-src/png/png.spec 28 Jun 2006 06:12:54 -0000 1.52
+++ openpkg-src/png/png.spec 26 Aug 2006 14:17:22 -0000 1.53
@@ -33,7 +33,7 @@
Group: Graphics
License: BSD
Version: 1.2.12
-Release: 20060628
+Release: 20060826
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/libpng/libpng-%{version}.tar.gz
@@ -42,8 +42,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, zlib
-PreReq: OpenPKG, openpkg >= 20040130, zlib
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: zlib
+PreReq: zlib
AutoReq: no
AutoReqProv: no
@@ -68,30 +70,20 @@
%patch -p0
%build
- %{l_make} %{l_mflags} \
- -f scripts/makefile.std \
- CC='%{l_cc}' \
- CFLAGS='%{l_cflags -O} -I$(ZLIBINC)' \
- ZLIBINC=%{l_prefix}/include \
- ZLIBLIB=%{l_prefix}/lib \
- libpng.a
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-libpng-compat \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix} \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
- %{l_make} %{l_mflags} \
- -f scripts/makefile.std \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- install
- %{l_shtool} install -c -m 644 \
- -e 's;@PREFIX@;%{l_prefix};g' \
- -e 's;libpng12;libpng;g' \
- -e 's;-lpng12;-lpng;g' \
- -e 's;/libpng12;;g' \
- scripts/libpng.pc.in \
- $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/libpng.pc
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libpng.so
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/lib/pkgconfig'
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
