From 9130e6bffccacf115385dc2f25329885536071d7 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:10:52 +0000 Subject: [PATCH] =?UTF-8?q?auto-import=20changelog=20data=20from=20gimp-1.?= =?UTF-8?q?2.1-5.src.rpm=20Tue=20Apr=2003=202001=20Matt=20Wilson=20=20-=20added=20gimp-1.2.1-locale.patch,=20which=20I've?= =?UTF-8?q?=20checked=20in=20to=20gimp=20CVS,=20to=20=20=20=20=20correctly?= =?UTF-8?q?=20set=20up=20the=20locale=20in=20plug-ins=20(#34214)=20Mon=20A?= =?UTF-8?q?pr=2002=202001=20Preston=20Brown=20=20-=20so?= =?UTF-8?q?me=20gimp-perl=20files=20weren't=20defattr'd=20(#34325)=20Fri?= =?UTF-8?q?=20Mar=2030=202001=20Trond=20Eivind=20Glomsr=F8d=20=20-=20Don't=20include=20embedxpm,=20as=20it=20depends=20on?= =?UTF-8?q?=20a=20non-included=20perl=20module=20=20=20=20=20(#=3D33249)?= =?UTF-8?q?=20-=20move=20gimpdoc=20and=20xcftopnm=20to=20gimp-perl,=20as?= =?UTF-8?q?=20they=20are=20dependant=20on=20the=20perl=20=20=20=20=20Gimp?= =?UTF-8?q?=20module=20Thu=20Mar=2001=202001=20Owen=20Taylor=20=20-=20Rebuild=20for=20GTK+-1.2.9=20include=20paths=20?= =?UTF-8?q?Mon=20Jan=2022=202001=20Matt=20Wilson=20=20-=20?= =?UTF-8?q?1.2.1=20Mon=20Dec=2025=202000=20Matt=20Wilson=20=20-=201.2.0=20Wed=20Dec=2020=202000=20Matt=20Wilson=20=20-=201.1.31=20Thu=20Dec=2014=202000=20Matt=20Wilson?= =?UTF-8?q?=20=20-=201.1.30=20-=20merge=20changes=20from?= =?UTF-8?q?=20CVS=20into=20rpm-4.0=20style=20spec=20file=20-=20removed=20v?= =?UTF-8?q?a=5Farg=20patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- gimp.spec | 92 +++++++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 62 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index b7ab299..b4eaee4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gimp-1.1.25.tar.bz2 +gimp-1.2.1.tar.bz2 diff --git a/gimp.spec b/gimp.spec index 613b70e..fc1184b 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,12 +1,12 @@ -%define subver 1.1 -%define microver 25 -%define ver %{subver}.%{microver} +%define subver 1.2 +%define age 0 +%define microver 1 Summary: The GNU Image Manipulation Program Name: gimp -Version: %{ver} -Release: 1 -Epoch: 1 +Version: %{subver}.%{microver} +Release: 5 +Epoch: 1 Copyright: GPL, LGPL Group: Applications/Multimedia URL: http://www.gimp.org/ @@ -14,12 +14,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gimp-data-min Obsoletes: gimp-libgimp Requires: gtk+ >= 1.2.0 -Source0: ftp://ftp.gimp.org/pub/gimp/unstable/v%{version}/%{name}-%{version}.tar.bz2 -Source1: gimp.desktop -Source2: gimp.png +Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/v%{version}/%{name}-%{version}.tar.bz2 +Source1: gimp.desktop +Source2: gimp.png Patch0: gimp-1.1.23-perlpath.patch Patch1: gimp-1.1.24-libaa.patch -Patch2: gimp-1.1.25-va_arg.patch +Patch2: gimp-1.2.1-locale.patch %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -73,16 +73,9 @@ The gimp-perl package contains all the perl extensions and perl plugins. %setup -q %patch0 -p1 -b .perlpath %patch1 -p1 -b .libaa -%patch2 -p1 -b .va_arg +%patch2 -p1 -b .locale %build -%ifarch %ix86 -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -ffast-math" -%endif -%ifarch alpha -MYARCH_FLAGS="--host=alpha-redhat-linux" -%endif - autoconf if [ ! -f configure ]; then CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} @@ -111,6 +104,7 @@ make prefix=$RPM_BUILD_ROOT/%{_prefix} \ infodir=$RPM_BUILD_ROOT/%{_infodir} \ datadir=$RPM_BUILD_ROOT/%{_datadir} \ includedir=$RPM_BUILD_ROOT/%{_includedir} \ + gimpsysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir}/gimp/%{subver} \ gimpplugindir=$RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} \ gimpdatadir=$RPM_BUILD_ROOT/%{_datadir}/gimp/%{subver} \ PREFIX=$RPM_BUILD_ROOT/%{_prefix} \ @@ -214,31 +208,33 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %{_datadir}/gimp/%{subver}/patterns/ %{_datadir}/gimp/%{subver}/scripts/ -%{_datadir}/gimp/%{subver}/gimprc -%{_datadir}/gimp/%{subver}/gimprc_user -%{_datadir}/gimp/%{subver}/gtkrc -%{_datadir}/gimp/%{subver}/unitrc +%{_sysconfdir}/gimp/%{subver}/gimprc +%{_sysconfdir}/gimp/%{subver}/gimprc_user +%{_sysconfdir}/gimp/%{subver}/gtkrc +%{_sysconfdir}/gimp/%{subver}/gtkrc_user +%{_sysconfdir}/gimp/%{subver}/unitrc +%{_sysconfdir}/gimp/%{subver}/ps-menurc + %{_datadir}/gimp/%{subver}/gimp_logo.ppm %{_datadir}/gimp/%{subver}/gimp_splash.ppm -%{_datadir}/gimp/%{subver}/ps-menurc %defattr (0755, root, root) %{_datadir}/gimp/%{subver}/user_install -%{_libdir}/libgimp-%{subver}.so.%{microver}.0.0 -%{_libdir}/libgimp-%{subver}.so.%{microver} -%{_libdir}/libgimpui-%{subver}.so.%{microver}.0.0 -%{_libdir}/libgimpui-%{subver}.so.%{microver} -%{_libdir}/libgck-%{subver}.so.%{microver}.0.0 -%{_libdir}/libgck-%{subver}.so.%{microver} +%{_libdir}/libgimp-%{subver}.so.%{age}.0.%{microver} +%{_libdir}/libgimp-%{subver}.so.%{age} +%{_libdir}/libgimpui-%{subver}.so.%{age}.0.%{microver} +%{_libdir}/libgimpui-%{subver}.so.%{age} +%{_libdir}/libgck-%{subver}.so.%{age}.0.%{microver} +%{_libdir}/libgck-%{subver}.so.%{age} %{_bindir}/gimp -%{_bindir}/embedxpm -%{_bindir}/gimpdoc -%{_bindir}/xcftopnm +#{_bindir}/embedxpm +%{_bindir}/escputil %defattr (0644, root, root) %{_mandir}/man1/gimp.1* +%{_mandir}/man1/escputil.1.* %{_mandir}/man5/gimprc.5* %files devel @@ -259,8 +255,40 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %{_mandir}/man1/gimptool.1* %files perl -f gimp-perl-files +%defattr (0755, root, root, 0755) +%{_bindir}/gimpdoc +%{_bindir}/xcftopnm %changelog +* Tue Apr 3 2001 Matt Wilson +- added gimp-1.2.1-locale.patch, which I've checked in to gimp CVS, to + correctly set up the locale in plug-ins (#34214) + +* Mon Apr 2 2001 Preston Brown +- some gimp-perl files weren't defattr'd (#34325) + +* Fri Mar 30 2001 Trond Eivind Glomsrød +- Don't include embedxpm, as it depends on a non-included perl module (#=33249) +- move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp + module + +* Thu Mar 01 2001 Owen Taylor +- Rebuild for GTK+-1.2.9 include paths + +* Mon Jan 22 2001 Matt Wilson +- 1.2.1 + +* Mon Dec 25 2000 Matt Wilson +- 1.2.0 + +* Wed Dec 20 2000 Matt Wilson +- 1.1.31 + +* Thu Dec 14 2000 Matt Wilson +- 1.1.30 +- merge changes from CVS into rpm-4.0 style spec file +- removed va_arg patch + * Mon Aug 21 2000 Matt Wilson - 1.1.25 diff --git a/sources b/sources index 9f8a465..98e2ee6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2df4bd78cb0e00b3c304b76ee62b7b2f gimp-1.1.25.tar.bz2 +0839d75836cf08210efe1d44a5613f5f gimp-1.2.1.tar.bz2