Procházet zdrojové kódy

upgrading package: gimp 1.2.3 -> 1.2.4

Michael Schloh von Bennewitz před 23 roky
rodič
revize
a4bba2f11f
2 změnil soubory, kde provedl 15 přidání a 13 odebrání
  1. 6 5
      gimp/gimp.patch
  2. 9 8
      gimp/gimp.spec

+ 6 - 5
gimp/gimp.patch

@@ -1,11 +1,12 @@
---- libgimp/Makefile.in.orig	Mon Feb 11 22:46:08 2002
-+++ libgimp/Makefile.in	Fri Apr 12 16:23:54 2002
-@@ -227,7 +227,7 @@
+diff -Naur gimp-1.2.4.orig/libgimp/Makefile.in gimp-1.2.4/libgimp/Makefile.in
+--- gimp-1.2.4.orig/libgimp/Makefile.in	2003-05-21 17:51:28.000000000 +0200
++++ gimp-1.2.4/libgimp/Makefile.in	2003-05-21 17:52:58.000000000 +0200
+@@ -228,7 +228,7 @@
  
  libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	$(no_undefined) 	$(libgimp_export_symbols)
  
--libgimp_la_LIBADD = $(GLIB_LIBS) -lm
-+libgimp_la_LIBADD = $(GTK_LIBS) -lm
+-libgimp_la_LIBADD = $(GLIB_LIBS) $(libmath)
++libgimp_la_LIBADD = $(GTK_LIBS) $(libmath)
  
  libgimp_la_DEPENDENCIES = $(gimp_def)
  

+ 9 - 8
gimp/gimp.spec

@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Graphics
 License:      GPL
-Version:      1.2.3
-Release:      20030117
+Version:      1.2.4
+Release:      20030522
 
 #   list of sources
 Source0:      ftp://ftp.gimp.org/pub/gimp/v1.2/v%{version}/gimp-%{version}.tar.bz2
@@ -42,8 +42,8 @@ Patch0:       gimp.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, libiconv, gtk, tiff, jpeg, xpm, make
-PreReq:       OpenPKG, openpkg >= 20020206, libiconv, gtk, tiff, jpeg, xpm
+BuildPreReq:  OpenPKG, openpkg >= 20020206, libiconv, gtk, glib, tiff, jpeg, xpm, make
+PreReq:       OpenPKG, openpkg >= 20020206, libiconv, gtk, glib, tiff, jpeg, xpm
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,12 +54,12 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
+    %patch -p1
 
 %build
-    CC="%{l_cc} %{l_cppflags tiff}" \
-    CFLAGS="%{l_cflags -O} %{l_cppflags tiff}" \
-    CPPFLAGS="%{l_cppflags tiff}" \
+    CC="%{l_cc} %{l_cppflags tiff glib}" \
+    CFLAGS="%{l_cflags -O} %{l_cppflags tiff glib}" \
+    CPPFLAGS="%{l_cppflags tiff glib}" \
     LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
@@ -70,6 +70,7 @@ AutoReqProv:  no
         --with-libiconv-prefix=%{l_prefix} \
         --enable-gimpdir=.gimp \
         --with-html-dir=%{l_prefix}/share/gimp/doc \
+        --disable-print \
         --disable-perl \
         --disable-nls
     %{l_make} %{l_mflags}