rpms/ufraw/devel ufraw.spec,1.23,1.24
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Mon Aug 6 07:46:38 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19363
Modified Files:
ufraw.spec
Log Message:
package ufraw-mime.xml for up to Fedora 7, RHEL 5
Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ufraw.spec 6 Aug 2007 07:26:15 -0000 1.23
+++ ufraw.spec 6 Aug 2007 07:46:06 -0000 1.24
@@ -7,6 +7,12 @@
%define splitpackage 0%{?_with_splitpackage:1}
%endif
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 5
+%define pkg_mime_xml 0%{!?_without_pkg_mime_xml:1}
+%else
+%define pkg_mime_xml 0%{?_with_pkg_mime_xml:1}
+%endif
+
%if %splitpackage
%define spkg 1
%endif
@@ -40,8 +46,13 @@
%else
Requires(post): GConf2
Requires(preun): GConf2
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
+%if %pkg_mime_xml
+Requires(post): shared-mime-info < 0.21
+Requires(postun): shared-mime-info < 0.21
+%else
+Requires(post): shared-mime-info >= 0.21
+Requires(postun): shared-mime-info >= 0.21
+%endif
%endif
#BuildRequires: automake libtool
@@ -95,6 +106,10 @@
make DESTDIR=%buildroot schemasdir=%{_sysconfdir}/gconf/schemas install
# don't ship dcraw binary
rm -f %{buildroot}%{_bindir}/dcraw
+%if %pkg_mime_xml
+install -d -m 0755 %buildroot%{_datadir}/mime/packages
+install -m ufraw-mime.xml %buildroot%{_datadir}/mime/packages
+%endif
%find_lang %{name}
@@ -124,7 +139,9 @@
%files %{?spkg:common} -f %{name}.lang
%defattr(-, root, root, -)
%doc COPYING README
+%if %pkg_mime_xml
%{_datadir}/mime/packages/ufraw-mime.xml
+%endif
%{_sysconfdir}/gconf/schemas/ufraw.schemas
%if %splitpackage
@@ -147,6 +164,7 @@
* Mon Aug 06 2007 Nils Philippsen <nphilipp at redhat.com> - 0.12-1
- version 0.12
- drop obsolete exiv2, cmserrorhandler patches
+- package ufraw-mime.xml for up to Fedora 7, RHEL 5
* Thu May 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.11-8
- use correct patch
More information about the fedora-extras-commits
mailing list