[GraphicsMagick] Split docs into -doc subpackage, drop README.txt (#1056306).
Ville Skyttä
scop at fedoraproject.org
Sat Jan 25 11:12:01 UTC 2014
commit 8d170c81a6a2ef2fe0d4cb1be24a5058760c91f9
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sat Jan 25 13:12:19 2014 +0200
Split docs into -doc subpackage, drop README.txt (#1056306).
- Drop no longer needed BrowseDelegateDefault modification.
- Convert docs to UTF-8.
GraphicsMagick.spec | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/GraphicsMagick.spec b/GraphicsMagick.spec
index 696cd2f..5ccb278 100644
--- a/GraphicsMagick.spec
+++ b/GraphicsMagick.spec
@@ -1,3 +1,4 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%if 0%{?fedora} > 15 || 0%{?rhel} > 6
%global _with_quantum_depth --with-quantum-depth=16
@@ -32,7 +33,7 @@
Summary: An ImageMagick fork, offering faster image generation and better quality
Name: GraphicsMagick
Version: 1.3.19
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT
Group: Applications/Multimedia
@@ -95,6 +96,14 @@ APIs, you need to install GraphicsMagick-devel as well as GraphicsMagick.
You do not need to install it if you just want to use GraphicsMagick,
however.
+%package doc
+Summary: GraphicsMagick documentation
+Group: Documentation
+%{!?el5:BuildArch: noarch}
+
+%description doc
+Documentation for GraphicsMagick.
+
%package perl
Summary: GraphicsMagick perl bindings
Group: System Environment/Libraries
@@ -143,19 +152,20 @@ however.
%patch1 -p1 -b .multilib
%patch50 -p1 -b .perl_linkage
-iconv -f iso-8859-2 -t utf8 < ChangeLog > ChangeLog.utf8
-mv -f ChangeLog.utf8 ChangeLog
+for f in ChangeLog.{2006,2008,2009,2012} NEWS.txt ; do
+ iconv -f iso-8859-2 -t utf8 < $f > $f.utf8
+ touch -r $f $f.utf8 ; mv -f $f.utf8 $f
+done
# Avoid lib64 rpaths (FIXME: recheck this on newer releases)
%if "%{_libdir}" != "/usr/lib"
sed -i.rpath -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
%endif
-sed -i -e "s|BrowseDelegateDefault=.*|BrowseDelegateDefault=\'xdg-open\'|" configure
-
%build
%configure --enable-shared --disable-static \
+ --docdir=%{_pkgdocdir} \
--with-%{lcms} \
--with-magick_plus_plus \
--with-modules \
@@ -252,9 +262,8 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc Copyright.txt
-%doc README.txt
-%doc %{_datadir}/doc/%{name}/
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/Copyright.txt
%{_libdir}/libGraphicsMagick%{?libQ}.so.3*
%{_libdir}/libGraphicsMagickWand%{?libQ}.so.2*
%{_bindir}/[a-z]*
@@ -276,6 +285,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/GraphicsMagick-config.*
%{_mandir}/man1/GraphicsMagickWand-config.*
+%files doc
+%defattr(-,root,root,-)
+%{_pkgdocdir}
+
%post c++ -p /sbin/ldconfig
%postun c++ -p /sbin/ldconfig
@@ -299,6 +312,11 @@ rm -rf %{buildroot}
%changelog
+* Sat Jan 25 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.3.19-4
+- Split docs into -doc subpackage, drop README.txt (#1056306).
+- Drop no longer needed BrowseDelegateDefault modification.
+- Convert docs to UTF-8.
+
* Thu Jan 09 2014 Rex Dieter <rdieter at fedoraproject.org> 1.3.19-3
- ppc64le is a multilib arch (#1051208)
More information about the scm-commits
mailing list