- added gtkdoc patch, fixed build with current (patched) gtk-doc

- noarch -apidocs
- updated Source URL
- release 10

diff --git a/libgnomeprint-gtkdoc.patch b/libgnomeprint-gtkdoc.patch
new file mode 100644 (file)
index 0000000..e4482ab
--- /dev/null
+++ b/libgnomeprint-gtkdoc.patch
@@ -0,0 +1,21 @@
+--- libgnomeprint-2.18.8/gtk-doc.make.orig     2010-02-09 13:32:51.000000000 +0100
++++ libgnomeprint-2.18.8/gtk-doc.make  2021-06-22 21:37:46.025365558 +0200
+@@ -67,9 +67,6 @@
+ #### templates ####
+ 
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+-      @echo '*** Rebuilding template files ***'
+-      @-chmod -R u+w $(srcdir)
+-      cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
+       touch tmpl-build.stamp
+ 
+ tmpl.stamp: tmpl-build.stamp
+@@ -97,7 +94,7 @@
+       cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+       test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+       @echo '-- Fixing Crossreferences' 
+-      cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++      cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+       touch html-build.stamp
+ endif
+ 

diff --git a/libgnomeprint.spec b/libgnomeprint.spec
index 0a3c588b5b353d9899d7ea7c24b63f2deff86882..d9f66c384e649509676d51936de13b61ec759481 100644 (file)
--- a/libgnomeprint.spec
+++ b/libgnomeprint.spec
@@ -1,21 +1,22 @@
 #
 # Conditional build:
-%bcond_with    apidocs # enable gtk-doc
+%bcond_without apidocs # gtk-doc based API documentation
 %bcond_without papi    # PAPI printing support
 
 Summary:       Printing library for GNOME
 Summary(pl.UTF-8):     Biblioteka drukowania dla GNOME
 Name:          libgnomeprint
 Version:       2.18.8
-Release:       9
+Release:       10
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgnomeprint/2.18/%{name}-%{version}.tar.bz2
+Source0:       https://download.gnome.org/sources/libgnomeprint/2.18/%{name}-%{version}.tar.bz2
 # Source0-md5: 63b05ffb5386e131487c6af30f4c56ac
 Patch0:                %{name}-includes.patch
 Patch1:                %{name}-papi.patch
 Patch2:                bison3.patch
-URL:           http://www.gnome.org/
+Patch3:                %{name}-gtkdoc.patch
+URL:           https://www.gnome.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake >= 1:1.7.2
 BuildRequires: bison
@@ -36,6 +37,7 @@ BuildRequires:        pango-devel >= 1:1.18.3
 %{?with_papi:BuildRequires:    papi-devel}
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: zlib-devel
 Requires:      fonts-Type1-urw
@@ -43,8 +45,6 @@ Requires:     glib2 >= 1:2.14.1
 Requires:      libart_lgpl >= 2.3.19
 Requires:      libxml2 >= 1:2.6.30
 Requires:      pango >= 1:1.18.3
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,6 +64,34 @@ dla użytkownika aplikacji i narzędzi do użytku w połączeniu z zarządcą
 okien X Window System. Pakiet libgnomeprint zawiera biblioteki
 niezbędne aplikacjom GNOME do drukowania.
 
+%package cups
+Summary:       CUPS module for libgnomeprint
+Summary(pl.UTF-8):     Moduł CUPS dla libgnomeprint
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      cups >= 1:1.1.20
+Requires:      libgnomecups >= 0.2.2
+
+%description cups
+CUPS module for libgnomeprint.
+
+%description cups -l pl.UTF-8
+Moduł CUPS dla libgnomeprint.
+
+%package papi
+Summary:       PAPI module for libgnomeprint
+Summary(pl.UTF-8):     Moduł PAPI dla libgnomeprint
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libgnomecups >= 0.2.2
+Requires:      papi
+
+%description papi
+PAPI module for libgnomeprint.
+
+%description papi -l pl.UTF-8
+Moduł PAPI dla libgnomeprint.
+
 %package devel
 Summary:       Include files for libgnomeprint
 Summary(pl.UTF-8):     Pliki nagłówkowe libgnomeprint
@@ -115,39 +143,18 @@ libgnomeprint API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API libgnomeprint.
 
-%package cups
-Summary:       CUPS module for libgnomeprint
-Summary(pl.UTF-8):     Moduł CUPS dla libgnomeprint
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      cups >= 1:1.1.20
-Requires:      libgnomecups >= 0.2.2
-
-%description cups
-CUPS module for libgnomeprint.
-
-%description cups -l pl.UTF-8
-Moduł CUPS dla libgnomeprint.
-
-%package papi
-Summary:       PAPI module for libgnomeprint
-Summary(pl.UTF-8):     Moduł PAPI dla libgnomeprint
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      libgnomecups >= 0.2.2
-Requires:      papi
-
-%description papi
-PAPI module for libgnomeprint.
-
-%description papi -l pl.UTF-8
-Moduł PAPI dla libgnomeprint.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+
+for f in libgnomeprint/transports/gp-transport-custom.h \
+       libgnomeprint/ttsubset/{crc32.c,crc32.h,sft.c,list.c,list.h,sft.c,sft.h,ttcr.c,ttcr.h} ; do
+       iconv -f iso-8859-1 -t utf-8 "$f" -o "${f}.tmp"
+       %{__mv} "${f}.tmp" "$f"
+done
 
 %build
 CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
@@ -158,7 +165,6 @@ CPPFLAGS="%{rpmcppflags}%{?with_papi: -I/usr/include/papi}"
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-font-install \
        --enable-gtk-doc%{!?with_apidocs:=no} \
        --with-cups \
        --with-html-dir=%{_gtkdocdir} \
@@ -177,6 +183,9 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/gnome/libgnomeprint-2.0/fonts
 # no static modules and *.la files - shut up check-files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*/modules/{*.{a,la},transports/*.{a,la},filters/*.{a,la}}
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgnomeprint-2-2.la
+
 %find_lang %{name}-2.2
 
 %clean
@@ -215,16 +224,17 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/gnome/libgnomeprint-2.0
 %dir %{_sysconfdir}/gnome/libgnomeprint-2.0/fonts
 
-%if %{with apidocs}
-%files apidocs
+%files cups
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libgnomeprint
-%endif
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintcups.so
+
+%files papi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintpapi.so
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnomeprint-2-2.so
-%{_libdir}/libgnomeprint-2-2.la
 %{_includedir}/libgnomeprint-2.2
 %{_pkgconfigdir}/libgnomeprint-2.2.pc
 
@@ -232,10 +242,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libgnomeprint-2-2.a
 
-%files cups
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintcups.so
-
-%files papi
+%if %{with apidocs}
+%files apidocs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/%{version}/modules/libgnomeprintpapi.so
+%{_gtkdocdir}/libgnomeprint
+%endif