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
This commit is contained in:
Nils Philippsen 2009-05-29 12:41:12 +00:00
parent eed550aed3
commit fa01e863a4

View File

@ -22,7 +22,6 @@ BuildRequires: sane-backends-devel >= 1.0.19-15
BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: sed
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
%description %description
@ -44,6 +43,14 @@ installed to use this package.
%prep %prep
%setup -q %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 %patch0 -p1 -b .xdg-open
%patch1 -p1 -b .eula-license-size %patch1 -p1 -b .eula-license-size
%patch2 -p1 -b .close-fds %patch2 -p1 -b .close-fds
@ -94,7 +101,7 @@ fi
%files -f XSANE.lang %files -f XSANE.lang
%defattr(-,root,root) %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 %{_bindir}/xsane
%{_mandir}/man1/* %{_mandir}/man1/*
%{_datadir}/sane %{_datadir}/sane
@ -108,11 +115,17 @@ fi
%dir %{_datadir}/sane %dir %{_datadir}/sane
%dir %{_datadir}/sane/xsane %dir %{_datadir}/sane/xsane
%{_datadir}/sane/xsane/*eula* %{_datadir}/sane/xsane/*eula*
%dir %{_sysconfdir}/gimp
%dir %{_sysconfdir}/gimp/plugins.d
%config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf %config(noreplace) %{_sysconfdir}/gimp/plugins.d/xsane.conf
%changelog %changelog
* Fri May 29 2009 Nils Philippsen <nils@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@redhat.com> - 0.996-6 * Mon Mar 02 2009 Nils Philippsen <nils@redhat.com> - 0.996-6
- rebuild against new sane-backends (just in case) - rebuild against new sane-backends (just in case)
@ -434,9 +447,3 @@ fi
* Thu Apr 22 1999 Preston Brown <pbrown@redhat.com> * Thu Apr 22 1999 Preston Brown <pbrown@redhat.com>
- initial RPM for PowerTools 6.0 - initial RPM for PowerTools 6.0