On Sun, 31 Dec 2000, Kevin Cozens wrote:
>Great timing, Marco. Yesterday and today I have been working on the .spec
>file for GIMP 1.2.0. I have a working one now.
Ohhh, good news! (My poor and overheated K6-233 takes a breath) ;))
>I'm just reviewing it as I am not sure that the libgimp .html files are being
>installed and probably should be.
If I remember well the "make install" places them into
share/gimp/1.2/devel-docs/, the current specfile doesn't notice them (the
should obviously go into gimp-devel).
>I am also trying to decide where scm2scm and scm2perl belong.
>Should they be in gimp and gimp-perl respectively, or gimp-devel for both?
I think they should go into gimp-perl, however I'm not sure if they are always
available, I suppose that they require some extra perl modules.
>Other than that, I will put a patch together for the spec files in a day or
>so.
Good, I've attached a revised patch of mine vs the gimp.spec.in that should fix
some stuff. It was contributed by my friend Giandomenico Di Tullio.
I hope this will help you. ;)
Happy new year! (and GIMP too!)
Marco
--
//\/\ Marco (LM) Lamberto
e-mail: lm(.)sunnyspot.org (replace '(.)' -> '@')
The Sunny Spot - http://the.sunnyspot.org/
--- gimp.spec.in.orig Wed Nov 8 00:12:01 2000
+++ gimp.spec.in Mon Jan 1 09:17:12 2001
@@ -1,6 +1,6 @@
%define subver @GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@
%define microver @GIMP_MICRO_VERSION@
-%define ver @VERSION@
+%define ver %{subver}.%{microver}
%define prefix /usr
%define sysconfdir /etc
@@ -16,7 +16,7 @@
Prefix: %{prefix}
Obsoletes: gimp-data-min
Obsoletes: gimp-libgimp
-Requires: gtk+ >= 1.2.0
+Requires: gtk+ >= 1.2.8
Source: ftp://ftp.gimp.org/pub/gimp/unstable/v%{version}/%{name}-%{version}.tar.bz2
%description
@@ -92,7 +92,7 @@
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{prefix}/info $RPM_BUILD_ROOT/%{prefix}/include \
$RPM_BUILD_ROOT/%{prefix}/lib $RPM_BUILD_ROOT/%{prefix}/bin
-make prefix=$RPM_BUILD_ROOT/%{prefix} PREFIX=$RPM_BUILD_ROOT/%{prefix} install
+make DESTDIR=$RPM_BUILD_ROOT install
# Strip the executables
strip $RPM_BUILD_ROOT/%{prefix}/bin/gimp
@@ -103,6 +103,9 @@
if [ -d $RPM_BUILD_ROOT/%{prefix}/man ]; then
find $RPM_BUILD_ROOT/%{prefix}/man -type f -exec gzip -9nf {} \;
fi
+if [ -d $RPM_BUILD_ROOT/%{prefix}/lib/perl5/man ]; then
+ find $RPM_BUILD_ROOT/%{prefix}/lib/perl5/man -type f -exec gzip -9nf {} \;
+fi
#
# This perl madness will drive me batty
@@ -131,6 +134,8 @@
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-libgimp
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-std-plugins
/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-script-fu
+ /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-perl
+
cat %{name}.lang gimp-libgimp gimp-std-plugins.lang gimp-script-fu.lang \
| sed "s:(644, root, root, 755):(444, bin, bin, 555):" > gimp-all.lang
fi
@@ -149,7 +154,7 @@
# Build the master filelists generated from the above mess.
#
cat gimp-plugin-files gimp-all.lang gimp-tips-files > gimp.files
-cat gimp-perl gimp-perl-plugin-files > gimp-perl-files
+cat gimp-perl gimp-perl-plugin-files gimp-perl.lang > gimp-perl-files
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -160,7 +165,7 @@
%files -f gimp.files
%attr (0555, bin, man) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO
-%attr (0555, bin, man) %doc docs/*.txt docs/*.eps ABOUT-NLS README.i18n README.perl README.win32 TODO
+%attr (0555, bin, man) %doc docs/*.txt ABOUT-NLS README.i18n README.perl README.win32 TODO
%defattr (0444, bin, bin, 0555)
%dir %{prefix}/share/gimp/%{subver}
%dir %{prefix}/share/gimp/%{subver}/tips
@@ -225,6 +230,7 @@
%defattr (0444, root, root, 0555)
%{prefix}/share/aclocal/gimp.m4
+%{prefix}/share/gimp/%{subver}/devel-docs
%{prefix}/lib/*.a
%{prefix}/lib/gimp/%{subver}/modules/*.a
@@ -236,6 +242,10 @@
%files perl -f gimp-perl-files
%changelog
+* Fri Dec 29 2000 Marco Lamberto <lm@xxxxxxxxxxxxx>
+- updated the install section by adding the DESTDIR environment var to
+ "make install"
+
* Fri Apr 14 2000 Matt Wilson <msw@xxxxxxxxxx>
- include subdirs in the help find
- remove gimp-help-files generation
