#6199103, Add help files, reviewed by Niall Power
authormattk
Thu, 13 Jan 2005 17:20:27 +0000
changeset 4836 80143925c23d
parent 4835 cdae7ae61cc8
child 4837 4d53f0e66771
#6199103, Add help files, reviewed by Niall Power
ChangeLog
gimp.spec
--- a/ChangeLog	Thu Jan 13 17:16:45 2005 +0000
+++ b/ChangeLog	Thu Jan 13 17:20:27 2005 +0000
@@ -1,3 +1,7 @@
+2005-01-13  Matt Keenan  <[email protected]>
+
+	* gimp.spec : #6199103 : Add help tarball
+
 2005-01-13  Laszlo Kovacs  <[email protected]>
 	* gnome-panel-04-menu-changes.diff,
 	gnome-panel-08-lockdown.diff,
--- a/gimp.spec	Thu Jan 13 17:16:45 2005 +0000
+++ b/gimp.spec	Thu Jan 13 17:20:27 2005 +0000
@@ -1,17 +1,19 @@
 %define subver 2.0
 %define microver 2
+%define help_version 6
 
 Name:         gimp
 License:      GPL, LGPL
 Group:        System/GUI/GNOME
 Version:      %{subver}.%{microver}
-Release:      43
+Release:      44
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GIMP (GNU Image Manipulation Program)
 Source:       ftp://ftp.gimp.org/pub/gimp/v2.1/gimp-%{version}.tar.bz2
 Source1: gimp-l10n-po-1.2.tar.bz2
 Source2: l10n-configure.sh
+Source3: gimp-help-2-0.%{help_version}.tar.bz2
 Patch1:       gimp-01-menu-entry.diff
 Patch2:       gimp-02-remove-keys.diff
 Patch3:       gimp-03-g11n-potfiles.diff
@@ -81,6 +83,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+/usr/bin/bzcat -dc %SOURCE3|tar xf -
 
 bash -x %SOURCE2
 
@@ -121,6 +124,22 @@
 	    %{print_options}
 make
 
+cd gimp-help-2-0.%{help_version}
+	./configure --prefix=%{_prefix}	\
+	    	    --sysconfdir=%{_sysconfdir} \
+	    	    --bindir=%{_bindir}		\
+	    	    --libdir=%{_libdir}		\
+            	    --includedir=%{_includedir} \
+	    	    --libexecdir=%{_libexecdir} \
+	    	    --localstatedir=/var/lib	\
+	    	    --mandir=%{_mandir}		\
+	    	    --enable-mp			\
+	    	    --enable-gtk-doc		\
+	    	    --enable-default-binary	\
+	    	    %{print_options}
+	make
+cd ..
+
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
 ./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
@@ -133,6 +152,10 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver}/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+cd gimp-help-2-0.%{help_version}
+	make DESTDIR=$RPM_BUILD_ROOT install
+cd ..
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -176,6 +199,7 @@
 %{_datadir}/gimp/%{subver}/scripts/
 %{_datadir}/gimp/%{subver}/themes/
 %{_datadir}/gimp/%{subver}/tips/
+%{_datadir}/gimp/%{subver}/help/
 %{_datadir}/applications/gimp-%{subver}.desktop
 %{_datadir}/application-registry/gimp-%{subver}.applications
 %{_datadir}/mime-info/gimp-%{subver}.keys
@@ -209,6 +233,9 @@
 %{_mandir}/man1/gimptool-%{subver}.1*
 
 %changelog
+* Tue Jan 11 2005 - [email protected]
+- #6199103 : Add gimp-help tarball
+
 * Fri Nov 12 2004 - [email protected]
 - Added --libdir and --bindir to configure opts so they can be redirected
   on Solaris