rpms/ufraw/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ufraw.spec, 1.10, 1.11

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	.cvsignore sources ufraw.spec 
Log Message:
version 0.10
add BR: perl, exiv2-devel, gettext
split standalone tools and GIMP plugin in Rawhide



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Aug 2006 14:32:44 -0000	1.5
+++ .cvsignore	7 Feb 2007 17:12:51 -0000	1.6
@@ -1 +1 @@
-ufraw-0.9.1.tar.gz
+ufraw-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Aug 2006 14:32:44 -0000	1.5
+++ sources	7 Feb 2007 17:12:51 -0000	1.6
@@ -1 +1 @@
-7388ed97a156ea6a7272513a1dc8f8d5  ufraw-0.9.1.tar.gz
+12d9bfdb8ed22e28129a729847ba6664  ufraw-0.10.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/extras/rpms/ufraw/devel/ufraw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ufraw.spec	28 Aug 2006 15:49:40 -0000	1.10
+++ ufraw.spec	7 Feb 2007 17:12:51 -0000	1.11
@@ -1,9 +1,19 @@
 %define gimptool gimptool-2.0
 %define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
 
-Summary: GIMP plugin to retrieve raw image data from digital cameras
+%if 0%{?fedora}%{?redhat} == 0 || 0%{?fedora} > 6 || 0%{?redhat} > 5
+%define splitpackage 0%{!?_without_splitpackage:1}
+%else
+%define splitpackage 0%{?_with_splitpackage:1}
+%endif
+
+%if %splitpackage
+%define spkg 1
+%endif
+
+Summary: Tool to retrieve raw image data from digital cameras
 Name: ufraw
-Version: 0.9.1
+Version: 0.10
 Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPL
@@ -13,40 +23,121 @@
 BuildRequires: gimp >= 2.0
 BuildRequires: gtk2-devel >= 2.6.0
 BuildRequires: lcms-devel
-BuildRequires: libexif-devel
+BuildRequires: libexif-devel >= 0.6.13
+BuildRequires: exiv2-devel >= 0.10
 BuildRequires: libtiff-devel 
 BuildRequires: libjpeg-devel
 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
+%endif
 
 %description
-UFRaw is a GIMP plug-in for opening digital cameras raw format images.
+UFRaw is a tool for opening raw format images of digital cameras.
+
+%if %splitpackage
+%package common
+Summary: Common files needed by UFRaw
+Group: Applications/Multimedia
+Obsoletes: ufraw < 0.10
+Conflicts: ufraw < 0.10
+
+%description common
+The ufraw-common files includes common files for UFRaw, e.g. language support.
+
+%package gimp
+Summary: GIMP plugin to retrieve raw image data from digital cameras
+Group: Applications/Multimedia
+Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: ufraw < 0.10
+Conflicts: ufraw < 0.10
+
+%description gimp
+The ufraw-gimp package contains a GIMP plugin for opening raw format images of
+digital cameras.
+%endif
 
 %prep
+cat << EOF
+
+Building UFRaw with these settings:
+splitpackage:   %splitpackage
+
+EOF
 %setup -q
 
 %build
-%configure
-make
+%configure --with-exiv2 --with-libexif --enable-mime --enable-extras
+make schemasdir=%{_sysconfdir}/gconf/schemas
 
 %install
 rm -rf %buildroot
-make DESTDIR=%buildroot install
+make DESTDIR=%buildroot schemasdir=%{_sysconfdir}/gconf/schemas install
+
+%find_lang %{name}
 
 %clean
 rm -rf %buildroot
 
-%files
-%defattr(-, root, root)
+%post %{?spkg:common}
+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
+%post
+%endif
+update-desktop-database >& /dev/null || :
+
+%preun %{?spkg:common}
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/ufraw.schemas >& /dev/null || :
+
+%postun %{?spkg:common}
+update-mime-database >& /dev/null || :
+%if ! %splitpackage
+%postun
+%endif
+update-desktop-database >& /dev/null || :
+
+%files %{?spkg:common} -f %{name}.lang
+%defattr(-, root, root, -)
 %doc COPYING README
+%{_datadir}/mime/packages/ufraw-mime.xml
+%{_sysconfdir}/gconf/schemas/ufraw.schemas
+
+%if %splitpackage
+%files
+%defattr(-, root, root, -)
+%endif
 %_bindir/*
 %_datadir/pixmaps/*
 %_datadir/applications/*.desktop
 %_mandir/man1/*
+
+%if %splitpackage
+%files gimp
+%defattr(-, root, root, -)
+%endif
 %dir %{gimpplugindir}
 %{gimpplugindir}/ufraw-gimp
 
 %changelog
+* Wed Feb 07 2007 Nils Philippsen <nphilipp at redhat.com> - 0.10-1
+- version 0.10
+- add BR: perl, exiv2-devel, gettext
+- split standalone tools and GIMP plugin in Rawhide
+
 * Mon Aug 28 2006 Nils Philippsen <nphilipp at redhat.com> - 0.9.1-1
 - version 0.9.1
 - require gimp >= 2.0 for building