rpms/ufraw/devel ufraw.spec,1.15,1.16

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/rpms/ufraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27776

Modified Files:
	ufraw.spec 
Log Message:
eventually put GConf2, shared-mime-info requirements into -common subpackage (#235583)



Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ufraw.spec	12 Mar 2007 13:27:41 -0000	1.15
+++ ufraw.spec	24 Apr 2007 14:21:59 -0000	1.16
@@ -14,7 +14,7 @@
 Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
 Version: 0.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/Multimedia
 License: GPL
 URL: http://ufraw.sourceforge.net
@@ -30,17 +30,18 @@
 BuildRequires: pkgconfig
 BuildRequires: perl
 BuildRequires: gettext
-Requires(post): GConf2
-Requires(preun): GConf2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
-Requires(post): shared-mime-info
-Requires(postun): shared-mime-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 %if %splitpackage
 Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: ufraw < 0.10
 Conflicts: ufraw < 0.10
+%else
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 %endif
 
 %description
@@ -52,6 +53,10 @@
 Group: Applications/Multimedia
 Obsoletes: ufraw < 0.10
 Conflicts: ufraw < 0.10
+Requires(post): GConf2
+Requires(preun): GConf2
+Requires(post): shared-mime-info
+Requires(postun): shared-mime-info
 
 %description common
 The ufraw-common files includes common files for UFRaw, e.g. language support.
@@ -96,7 +101,7 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ufraw.schemas >& /dev/null
 update-mime-database >& /dev/null || :
-%if ! %splitpackage
+%if %splitpackage
 %post
 %endif
 update-desktop-database >& /dev/null || :
@@ -107,7 +112,7 @@
 
 %postun %{?spkg:common}
 update-mime-database >& /dev/null || :
-%if ! %splitpackage
+%if %splitpackage
 %postun
 %endif
 update-desktop-database >& /dev/null || :
@@ -135,6 +140,10 @@
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> - 0.11-4
+- eventually put GConf2, shared-mime-info requirements into -common subpackage
+  (#235583)
+
 * Mon Mar 12 2007 Nils Philippsen <nphilipp at redhat.com> - 0.11-3
 - split pkg from fc6/rhel5 on to avoid upgrading mess