Some times ago me and other guys complained about a broken support for building
GIMP's RPMs.
This time I've fixed the main problem related to the "prefix" var used for
installation, now changed into "DESTDIR", and I've attached a patch vs 1.2.0.
I've added the DESTDIR support in the subdirs that still hold the old
installation prefix.
It works even with GIMP perl plug-in but without changing anything in its
subtree.
I hope someone will fix also the broken RPM specfile (the main trouble is the
file listing generation), I've tried for a while but I'm not sure I can fix it
in short time (mainly dued to the poor performance of my home machine -
rebuilding the whole stuff requires about 1h).
Please check the patch and _please_ merge those changes in order to build again
easily and RPMmed GIMP. ;)
Happy GIMPing,
Marco
--
//\/\ Marco (LM) Lamberto
e-mail: lm(.)sunnyspot.org (replace '(.)' -> '@')
The Sunny Spot - http://the.sunnyspot.org/
--- gimp-1.2.0lm/plug-ins/perl/po/Makefile.in.in.orig Fri Dec 29 12:13:59 2000
+++ gimp-1.2.0lm/plug-ins/perl/po/Makefile.in.in Fri Dec 29 12:14:22 2000
@@ -121,7 +121,7 @@
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
--- gimp-1.2.0lm/plug-ins/perl/Makefile.PL.orig Fri Dec 29 14:03:30 2000
+++ gimp-1.2.0lm/plug-ins/perl/Makefile.PL Fri Dec 29 14:03:32 2000
@@ -195,7 +195,7 @@
$main::dont_embed || (cd embed && \$(MAKE) install)
install-po:
- cd po && \$(MAKE) install
+# cd po && \$(MAKE) install
".$install;
}
--- gimp-1.2.0lm/plug-ins/Makefile.in.orig Fri Dec 29 11:27:02 2000
+++ gimp-1.2.0lm/plug-ins/Makefile.in Fri Dec 29 14:12:30 2000
@@ -226,6 +226,9 @@
local_target="$$target-am"; \
else \
local_target="$$target"; \
+ if test ! -z "$(DESTDIR)" && test ! -z "$(GIMP_PERL)" && test
+"$$subdir" = "$(GIMP_PERL)"; then \
+ local_target="PREFIX=$(DESTDIR)$(prefix)
+gimpplugindir=$(DESTDIR)$(gimpplugindir) $$local_target"; \
+ fi; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
--- gimp-1.2.0lm/po/Makefile.in.in.orig Sun Dec 24 22:43:05 2000
+++ gimp-1.2.0lm/po/Makefile.in.in Fri Dec 29 09:51:42 2000
@@ -123,7 +123,7 @@
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
--- gimp-1.2.0lm/po-libgimp/Makefile.in.in.orig Thu Jan 27 11:46:58 2000
+++ gimp-1.2.0lm/po-libgimp/Makefile.in.in Fri Dec 29 09:53:20 2000
@@ -123,7 +123,7 @@
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
--- gimp-1.2.0lm/po-script-fu/Makefile.in.in.orig Sat Jun 24 12:46:57 2000
+++ gimp-1.2.0lm/po-script-fu/Makefile.in.in Fri Dec 29 09:54:27 2000
@@ -130,7 +130,7 @@
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$$destdir/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
--- gimp-1.2.0lm/gimp.spec.in.orig Wed Nov 8 00:12:01 2000
+++ gimp-1.2.0lm/gimp.spec.in Fri Dec 29 13:09:17 2000
@@ -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
@@ -225,6 +225,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 +237,10 @@
%files perl -f gimp-perl-files
%changelog
+* Fri Dec 29 2000 Marco Lamberto <[EMAIL PROTECTED]>
+- updated the install section by adding the DESTDIR environment var to
+ "make install"
+
* Fri Apr 14 2000 Matt Wilson <[EMAIL PROTECTED]>
- include subdirs in the help find
- remove gimp-help-files generation
