OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Mar-2004 20:27:11
Branch: HEAD Handle: 2004032419271100
Modified files:
openpkg-src/gimp gimp.spec
Removed files:
openpkg-src/gimp gimp.patch
Log:
upgrading package: gimp 1.2.5 -> 2.0.0
Summary:
Revision Changes Path
1.3 +0 -12 openpkg-src/gimp/gimp.patch
1.43 +18 -20 openpkg-src/gimp/gimp.spec
____________________________________________________________________________
rm -f openpkg-src/gimp/gimp.patch <<'@@ .'
Index: openpkg-src/gimp/gimp.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gimp/gimp.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 gimp.spec
--- openpkg-src/gimp/gimp.spec 7 Feb 2004 17:55:07 -0000 1.42
+++ openpkg-src/gimp/gimp.spec 24 Mar 2004 19:27:11 -0000 1.43
@@ -33,20 +33,19 @@
Class: PLUS
Group: Graphics
License: GPL
-Version: 1.2.5
-Release: 20040207
+Version: 2.0.0
+Release: 20040324
# list of sources
-Source0: ftp://ftp.gimp.org/pub/gimp/v1.2/v%{version}/gimp-%{version}.tar.bz2
-Patch0: gimp.patch
+Source0: ftp://ftp.gimp.org/pub/gimp/v2.0/v%{version}/gimp-%{version}.tar.bz2
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, libiconv, gtk, glib, gcc
-BuildPreReq: tiff, jpeg, png, zlib, xpm, make
-PreReq: OpenPKG, openpkg >= 20040130, libiconv, gtk, glib
-PreReq: tiff, jpeg, png, zlib, xpm
+BuildPreReq: OpenPKG, openpkg >= 20040130, libiconv, gtk2, glib2, gcc
+BuildPreReq: tiff, jpeg, png, xpm, zlib, make, pkgconfig
+PreReq: OpenPKG, openpkg >= 20040130, libiconv, gtk2, glib2
+PreReq: tiff, jpeg, png, xpm, zlib
AutoReq: no
AutoReqProv: no
@@ -59,7 +58,7 @@
prog gimp = {
version = %{version}
url = ftp://ftp.gimp.org/pub/gimp/
- regex = (?<!\w)v(1\.[24])
+ regex = (?<!\w)v(2\.[024])
url = ftp://ftp.gimp.org/pub/gimp/v__NEWVER__/
regex = (?<!\w)v(__VER__)
url = ftp://ftp.gimp.org/pub/gimp/v__NEWVER1__/v__NEWVER__/
@@ -68,32 +67,31 @@
%prep
%setup -q
- %patch -p1
%build
- CC="%{l_cc} %{l_cppflags tiff glib}" \
- CFLAGS="%{l_cflags -O} %{l_cppflags tiff glib}" \
- CPPFLAGS="%{l_cppflags tiff glib}" \
+ CC="%{l_cc} %{l_cppflags tiff gtk2 glib2}" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags tiff gtk2 glib2}" \
+ CPPFLAGS="%{l_cppflags tiff gtk2 glib2}" \
LDFLAGS="%{l_ldflags}" \
+ LIBS="-lpangoft2" \
./configure \
--prefix=%{l_prefix} \
+ --disable-shared \
+ --enable-static \
--with-x \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
--x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
- --with-gtk-prefix=%{l_prefix} \
- --with-libiconv-prefix=%{l_prefix} \
- --enable-gimpdir=.gimp \
+ --with-gimpdir=.gimp \
--with-html-dir=%{l_prefix}/share/gimp/doc \
- --disable-print \
- --disable-perl \
- --disable-nls
+ --disable-print
%{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.so*
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/aclocal
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
rm -f gimp; mv gimp-[0-9].[0-9]* gimp
rm -f gimptool; mv gimptool-[0-9].[0-9]* gimptool
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
