- updated to 4.3.8

- added gettext.patch to allow using autopoint
- enable building foomatic data
- renamed gimp-print-lib to libgimpprint and separate UI library to libgimpprintui
- disable building translated PPDs
- enable dlopened modules
- added --with static and --without foomatic bconds

Changed files:
    gimp-print.spec -> 1.37

1 files changed, 167 insertions, 48 deletions

diff --git a/gimp-print.spec b/gimp-print.spec
index db4f029..522a286 100644
--- a/gimp-print.spec
+++ b/gimp-print.spec
@@ -3,6 +3,8 @@
 # _without_cups		- without CUPS subpackage
 # _without_gimp		- without GIMP plugin subpackage
 # _without_ijs		- without IJS server for Ghostscript
+# _without_foomatic	- don't generate foomatic data
+# _with_static          - enable building static library
 #
 # TODO:
 # - port info_and_pdf_only.patch and install documentation in correct place.
@@ -15,8 +17,8 @@ Summary:	Collection of high-quality printer drivers
 Summary(pl):	Zestaw wysokiej jako¶ci sterowników do drukarek
 Summary(pt_BR):	plugin GIMP-Print para impressão de imagens em alta qualidade
 Name:		gimp-print
-Version:	4.3.6
-Release:	1
+Version:	4.3.8
+Release:	0.1
 License:	GPL
 Group:		Applications/Printing
 Source0:	http://prdownloads.sourceforge.net/gimp-print/%{name}-%{version}.tar.bz2
@@ -24,6 +26,7 @@ Patch0:		%{name}-install.patch
 Patch1:		%{name}-info.patch
 Patch2:		%{name}-usb.patch
 Patch3:		%{name}-info_and_pdf_only.patch
+Patch4:		%{name}-gettext.patch
 URL:		http://gimp-print.sf.net/
 %{!?_without_cups:BuildRequires:	cups-devel >= 1.1.9}
 %{!?_without_gimp:BuildRequires:	gimp-devel >= 1:1.2.3-1.4}
@@ -32,10 +35,12 @@ BuildRequires:	texinfo
 BuildRequires:	texinfo-texi2dvi
 BuildRequires:	docbook-style-dsssl
 BuildRequires:	docbook-utils
+BuildRequires:	gettext-autopoint
 %{!?_without_ijs:BuildRequires:	ghostscript-ijs-devel}
 BuildRequires:	rpm-perlprov >= 3.0.3-16
+%{!?_without_foomatic:BuildRequires:	foomatic-db-engine >= 2.9.1}
 Requires:	gimp >= 1:1.2.2-5
-Requires:	%{name}-lib = %{version}
+Requires:	libgimpprint = %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,56 +77,114 @@ marcas de impressoras como HP também atingem qualidades altas de
 impressão. Esse plugin também é capaz de gerar arquivos Postscript que
 permite ser usado em qualquer outra impressora.
 
-%package lib
+%package -n libgimpprint
 Summary:	gimp-print library
 Summary(pl):	Biblioteka gimp-print
 Summary(pt_BR):	Bibliotecas dinâmicas para impressão de alta qualidade
 Group:		Libraries
+Obsoletes:	gimp-print-lib 
 
-%description lib
+%description -n libgimpprint
 Gimp-print library.
 
-%description lib -l pl
+%description -n libgimpprint -l pl
 Biblioteka Gimp-print.
 
-%description lib -l pt_BR
+%description -n libgimpprint -l pt_BR
 Esse pacote contém bibliotecas dinâmicas de alta qualidade para serem
 usados pelo plugin do Gimp gimp-print, pelo driver "stp" do
 ghostscript e por drivers especializados do CUPS
 
-%package devel
+%package -n libgimpprint-devel
 Summary:	gimp-print development tools
 Summary(pl):	Pliki nag³ówkowe itp. do gimp-print
 Summary(pt_BR):	Cabeçalhos e arquivos de desenvolvimento para o libgimpprint
 Group:		Development/Libraries
-Requires:	%{name}-lib = %{version}-%{release}
+Requires:	libgimpprint = %{version}-%{release}
+Obsoletes:	gimp-print-devel
 
-%description devel
+%description -n libgimpprint-devel
 Gimp-print development tools and headers.
 
-%description devel -l pl
+%description -n libgimpprint-devel -l pl
 Nag³ówki i narzêdzia deweloperskie dla Gimp-print.
 
-%description devel -l pt_BR
+%description -n libgimpprint-devel -l pt_BR
 Este são os arquivos de desenvolvimento para compilar programas com a
 biblioteca libgimpprint.
 
-%package static
+%package -n libgimpprint-static
 Summary:	gimp-print static libraries
 Summary(pl):	Statyczne biblioteki gimp-print
 Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com gimp-print
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libgimpprint-devel = %{version}-%{release}
+Obsoletes:	gimp-print-static
 
-%description static
+%description -n libgimpprint-static
 Gimp-print static libraries.
 
-%description static -l pl
+%description -n libgimpprint-static -l pl
 Biblioteki statyczne Gimp-print.
 
-%description static -l pt_BR
+%description -n libgimpprint-static -l pt_BR
 Bibliotecas estáticas para desenvolvimento com gimp-print.
 
+%package -n libgimpprintui
+Summary:	gimp-print UI library
+Summary(pl):	Biblioteka gimp-print
+Summary(pt_BR):	Bibliotecas dinâmicas para impressão de alta qualidade
+Group:		Libraries
+Obsoletes:	gimp-print-lib 
+Requires:	libgimpprint = %{version}-%{release}
+
+%description -n libgimpprintui
+Gimp-print library.
+
+%description -n libgimpprintui -l pl
+Biblioteka Gimp-print.
+
+%description -n libgimpprintui -l pt_BR
+Esse pacote contém bibliotecas dinâmicas de alta qualidade para serem
+usados pelo plugin do Gimp gimp-print, pelo driver "stp" do
+ghostscript e por drivers especializados do CUPS
+
+%package -n libgimpprintui-devel
+Summary:	gimp-print development tools
+Summary(pl):	Pliki nag³ówkowe itp. do gimp-print
+Summary(pt_BR):	Cabeçalhos e arquivos de desenvolvimento para o libgimpprint
+Group:		Development/Libraries
+Requires:	libgimpprintui = %{version}-%{release}
+Obsoletes:	gimp-print-devel
+
+%description -n libgimpprintui-devel
+Gimp-print development tools and headers.
+
+%description -n libgimpprintui-devel -l pl
+Nag³ówki i narzêdzia deweloperskie dla Gimp-print.
+
+%description -n libgimpprintui-devel -l pt_BR
+Este são os arquivos de desenvolvimento para compilar programas com a
+biblioteca libgimpprint.
+
+%package -n libgimpprintui-static
+Summary:	gimp-print static libraries
+Summary(pl):	Statyczne biblioteki gimp-print
+Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com gimp-print
+Group:		Development/Libraries
+Requires:	libgimpprintui-devel = %{version}-%{release}
+Obsoletes:	gimp-print-static
+
+%description -n libgimpprintui-static
+Gimp-print static libraries.
+
+%description -n libgimpprintui-static -l pl
+Biblioteki statyczne Gimp-print.
+
+%description -n libgimpprintui-static -l pt_BR
+Bibliotecas estáticas para desenvolvimento com gimp-print.
+
+
 %package -n escputil
 Summary:	Tool for Epson ink printers
 Summary(pl):	Narzêdzie do drukarek atramentowych Epson
@@ -191,6 +254,7 @@ Przyk³ady dla Gimp-print.
 Summary:	gimp-print IJS driver for GhostScript
 Summary(pl):	Sterownik IJS Gimp-print dla GhostScript
 Group:		Applications/Printing
+Requires:	libgimpprint = %{version}-%{release}
 
 %description ijs
 Gimp-print IJS driver for GhostScript.
@@ -198,6 +262,14 @@ Gimp-print IJS driver for GhostScript.
 %description ijs -l pl
 Sterownik IJS Gimp-print dla GhostScript.
 
+%package -n foomatic-db-gimp-print
+Summary:	foomatic data for gimp-print IJS driver
+Group:		Applications/Printing
+Requires:	%{name}-ijs = %{version}-%{release}
+Requires:	foomatic-db-engine >= 2.9.1
+
+%description -n foomatic-db-gimp-print
+foomatic data for gimp-print IJS driver.
 
 %prep 
 %setup  -q 
@@ -205,23 +277,37 @@ Sterownik IJS Gimp-print dla GhostScript.
 #%patch1 -p1
 %patch2 -p1
 #%patch3 -p1
+%patch4 -p1 
 
 %build
+rm -f m4extra/{libtool.m4,gettext.m4,lcmessage.m4,progtest.m4}
+%{!?_without_gimp:rm -f m4extra/gimp.m4}
+%{__libtoolize}
+%{__autopoint}
+aclocal -I m4 -I m4extra
+touch src/main/gimpprint.pc.in \
+	src/libgimpprintui/gimpprint-ui.pc.in
+%{__automake}
+%{__autoconf}
+
 %configure \
 	%{?debug:--enable-debug} \
 	--with%{?_without_cups:out}-cups \
 	--with%{?_without_gimp:out}-gimp \
 	--with%{?_without_ijs:out}-ijs \
+	--with%{?_without_foomatic:out}-foomatic \
+	%{?_with_static:--enable-static} \
+	--with-modules=dlopen \
 	--enable-escputil \
 	--enable-libgimpprint \
-	--enable-translated-cups-ppds \
+	--disable-translated-cups-ppds \
 	--enable-cups-level3-ppds \
 	--enable-lexmarkutil \
-	--without-foomatic \
 	--enable-samples \
 	--enable-user-guide \
-	--enable-static \
-	--without-ghost
+	--enable-xmldef \
+	--disable-rpath \
+	--without-ghost 
 %{__make}
 
 %install
@@ -230,7 +316,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-#mv -f $RPM_BUILD_ROOT%{_datadir}/gimp-print/doc doc-installed
+mv -f $RPM_BUILD_ROOT%{_datadir}/gimp-print/doc doc-installed
 #mv -f doc-installed/manual-html doc-installed/manual
 #mv -f doc-installed/html doc-installed/user-guide
 mv -f $RPM_BUILD_ROOT%{_datadir}/gimp-print/samples \
@@ -243,69 +329,94 @@ echo '.so cups-genppdconfig.8' > $RPM_BUILD_ROOT%{_mandir}/man8/update-cups-genp
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	lib -p /sbin/ldconfig
-%postun	lib -p /sbin/ldconfig
+%post	-n libgimpprint -p /sbin/ldconfig
+%postun	-n libgimpprint -p /sbin/ldconfig
+%post	-n libgimpprintui -p /sbin/ldconfig
+%postun	-n libgimpprintui -p /sbin/ldconfig
 
-%post devel
+%post -n libgimpprint-devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%postun devel
+%postun -n libgimpprint-devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%if %{?!_without_gimp:1}%{?_without_gimp:0}
+%if %{?!_without_gimp:1}0
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %(gimptool --gimpplugindir)/plug-ins/*
 %endif
 
-%files lib -f %{name}.lang
+%files -n libgimpprint -f %{name}.lang
 %defattr(644,root,root,755)
-#%%doc doc-installed/*.pdf doc-installed/manual 
+%doc doc-installed/gimpprint.ps doc-installed/html doc-installed/users-guide.pdf
 %doc doc/FAQ.html AUTHORS README NEWS ChangeLog
 %attr(755,root,root) %{_libdir}/libgimpprint-*.so
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/%{version}
+%dir %{_libdir}/%{name}/%{version}/modules
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/*.so
+%{_datadir}/%{name}/%{version}
+%{_mandir}/man7/*
+
+%files -n libgimpprintui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgimpprintui-*.so
 
-%files devel
+%files -n libgimpprint-devel
 %defattr(644,root,root,755)
+%doc doc-installed/developer-html
 %attr(755,root,root) %{_libdir}/libgimpprint.so
 %{_libdir}/libgimpprint.la
-%attr(755,root,root) %{_bindir}/gimpprint-config
+%{_pkgconfigdir}/gimpprint.pc
 %{_includedir}/gimp-print
-%{_aclocaldir}/gimpprint.m4
-%{_pkgconfigdir}/*
 %{_mandir}/man1/gimpprint-config.1*
 %{_mandir}/man3/gimpprint.3*
 %{_datadir}/info/*info*
 
-%files static
+%files -n libgimpprintui-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgimpprintui.so
+%{_libdir}/libgimpprintui.la
+%{_pkgconfigdir}/gimpprint-ui.pc
+%{_includedir}/gimp-print
+
+%if %{?_with_static:1}0
+%files -n libgimpprint-static
 %defattr(644,root,root,755)
 %{_libdir}/libgimpprint.a
 
+%files -n libgimpprintui-static
+%defattr(644,root,root,755)
+%{_libdir}/libgimpprintui.a
+%endif
+
 %files -n escputil
 %defattr(644,root,root,755)
 %{_mandir}/man1/escputil.1*
 %attr(755,root,root) %{_bindir}/escputil
 
-%if %{?_without_cups:0}%{!?_without_cups:1}
+%if %{!?_without_cups:1}0
 %files cups
 %defattr(644,root,root,755)
 %doc src/cups/README src/cups/command.txt src/cups/commands
 %{_sysconfdir}/cups/command.types
 %attr(755,root,root) %{_bindir}/cups-*
+%attr(755,root,root) %{_sbindir}/cups-*
 %{_datadir}/cups/calibrate.ppm
 #%{_datadir}/cups/model/C/*
 %{_datadir}/cups/model/gimp-print/en/*
-%lang(en_GB) %{_datadir}/cups/model/gimp-print/en_GB/*
-%lang(da) %{_datadir}/cups/model/gimp-print/da/*
-%lang(de) %{_datadir}/cups/model/gimp-print/de/*
-%lang(el) %{_datadir}/cups/model/gimp-print/el/*
-%lang(es) %{_datadir}/cups/model/gimp-print/es/*
-%lang(fr) %{_datadir}/cups/model/gimp-print/fr/*
-%lang(nl) %{_datadir}/cups/model/gimp-print/nl/*
-%lang(no) %{_datadir}/cups/model/gimp-print/no/*
-%lang(pl) %{_datadir}/cups/model/gimp-print/pl/*
-%lang(pt) %{_datadir}/cups/model/gimp-print/pt/*
-%lang(sk) %{_datadir}/cups/model/gimp-print/sk/*
-%lang(sv) %{_datadir}/cups/model/gimp-print/sv/*
+#%lang(en_GB) %{_datadir}/cups/model/gimp-print/en_GB/*
+#%lang(da) %{_datadir}/cups/model/gimp-print/da/*
+#%lang(de) %{_datadir}/cups/model/gimp-print/de/*
+#%lang(el) %{_datadir}/cups/model/gimp-print/el/*
+#%lang(es) %{_datadir}/cups/model/gimp-print/es/*
+#%lang(fr) %{_datadir}/cups/model/gimp-print/fr/*
+#%lang(nl) %{_datadir}/cups/model/gimp-print/nl/*
+#%lang(no) %{_datadir}/cups/model/gimp-print/no/*
+#%lang(pl) %{_datadir}/cups/model/gimp-print/pl/*
+#%lang(pt) %{_datadir}/cups/model/gimp-print/pt/*
+#%lang(sk) %{_datadir}/cups/model/gimp-print/sk/*
+#%lang(sv) %{_datadir}/cups/model/gimp-print/sv/*
 %attr(755,root,root) %{_libdir}/cups/backend/*
 %attr(755,root,root) %{_libdir}/cups/filter/*
 %{_mandir}/man8/*cups*.8*
@@ -315,8 +426,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}
 
-%if %{?_without_ijs:0}%{!?_without_ijs:1}
+%if %{!?_without_ijs:1}0
 %files ijs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ijsgimpprint
+%{_mandir}/man1/ijsgimpprint.1*
+%endif
+
+%if %{!?_without_foomatic:1}0
+%files -n foomatic-db-gimp-print
+%defattr(644,root,root,755)
+%{_datadir}/foomatic/db/source/driver/*
+%{_datadir}/foomatic/db/source/opt/*
 %endif