rpms/xsane/devel xsane.spec,1.68,1.69

Nils Philippsen nphilipp at fedoraproject.org
Fri May 29 12:41:43 UTC 2009


Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4131

Modified Files:
	xsane.spec 
Log Message:
Merge review (#226658):
- convert documentation files to UTF-8
- don't BR: sed
- don't own /usr/share/applications, /etc/gimp, /etc/gimp/plugins.d
- don't package unnecessary documentation



Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/devel/xsane.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xsane.spec	2 Mar 2009 14:42:09 -0000	1.68
+++ xsane.spec	29 May 2009 12:41:12 -0000	1.69
@@ -22,7 +22,6 @@ BuildRequires: sane-backends-devel >= 1.
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: libtiff-devel
 BuildRequires: gettext-devel
-BuildRequires: sed
 ExcludeArch: s390 s390x
 
 %description
@@ -44,6 +43,14 @@ installed to use this package.
 
 %prep
 %setup -q
+
+# convert some files to UTF-8
+for doc in xsane.{CHANGES,PROBLEMS,INSTALL}; do
+    iconv -f ISO-8859-1 -t utf8 "$doc" -o "$doc.new" && \
+    touch -r "$doc" "$doc.new" && \
+    mv "$doc.new" "$doc"
+done
+
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .eula-license-size
 %patch2 -p1 -b .close-fds
@@ -94,7 +101,7 @@ fi
 
 %files -f XSANE.lang
 %defattr(-,root,root)
-%doc xsane.[A-Z]*
+%doc xsane.ACCELKEYS xsane.AUTHOR xsane.BEGINNERS-INFO xsane.BUGS xsane.CHANGES xsane.COPYING xsane.FAQ xsane.LANGUAGES xsane.LOGO xsane.NEWS xsane.ONLINEHELP xsane.PROBLEMS xsane.ROOT xsane.TODO
 %{_bindir}/xsane
 %{_mandir}/man1/*
 %{_datadir}/sane
@@ -108,11 +115,17 @@ fi
 %dir %{_datadir}/sane
 %dir %{_datadir}/sane/xsane
 %{_datadir}/sane/xsane/*eula*
-%dir %{_sysconfdir}/gimp
-%dir %{_sysconfdir}/gimp/plugins.d
 %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
 
 %changelog
+* Fri May 29 2009 Nils Philippsen <nils at redhat.com>
+- Merge review (#226658):
+  - convert documentation files to UTF-8
+  - don't BR: sed
+  - don't own %{_datadir}/applications, %{_sysconfdir}/gimp,
+    %{_sysconfdir}/gimp/plugins.d
+  - don't package unnecessary documentation
+
 * Mon Mar 02 2009 Nils Philippsen <nils at redhat.com> - 0.996-6
 - rebuild against new sane-backends (just in case)
 
@@ -434,9 +447,3 @@ fi
 
 * Thu Apr 22 1999 Preston Brown <pbrown at redhat.com>
 - initial RPM for PowerTools 6.0
-
-
-
-
-
-




More information about the fedora-extras-commits mailing list