rpms/ufraw/F-7 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 ufraw.spec, 1.20, 1.21 ufraw-0.11-cmserrorhandler.patch, 1.1, NONE ufraw-0.11-exiv2.patch, 1.2, NONE
Nils Philippsen (nphilipp)
fedora-extras-commits at redhat.com
Mon Aug 6 13:23:00 UTC 2007
Author: nphilipp
Update of /cvs/pkgs/rpms/ufraw/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498
Modified Files:
.cvsignore sources ufraw.spec
Removed Files:
ufraw-0.11-cmserrorhandler.patch ufraw-0.11-exiv2.patch
Log Message:
drop obsolete exiv2, cmserrorhandler patches
package ufraw-mime.xml for up to Fedora 7, RHEL 5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 12 Mar 2007 11:12:46 -0000 1.7
+++ .cvsignore 6 Aug 2007 13:22:28 -0000 1.8
@@ -1 +1 @@
-ufraw-0.11.tar.gz
+ufraw-0.12.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 12 Mar 2007 11:12:46 -0000 1.7
+++ sources 6 Aug 2007 13:22:28 -0000 1.8
@@ -1 +1 @@
-e7e5930a872657830a77dc9ddbfce93b ufraw-0.11.tar.gz
+b2c104938c1c3eb47e7605432bbd3157 ufraw-0.12.tar.gz
Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-7/ufraw.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ufraw.spec 24 May 2007 14:46:03 -0000 1.20
+++ ufraw.spec 6 Aug 2007 13:22:28 -0000 1.21
@@ -7,14 +7,20 @@
%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
Summary: Tool to retrieve raw image data from digital cameras
Name: ufraw
-Version: 0.11
-Release: 8%{?dist}
+Version: 0.12
+Release: 1%{?dist}
Group: Applications/Multimedia
License: GPL
URL: http://ufraw.sourceforge.net
@@ -24,7 +30,7 @@
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: lcms-devel
BuildRequires: libexif-devel >= 0.6.13
-BuildRequires: exiv2-devel
+BuildRequires: exiv2-devel >= 0.11
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig
@@ -40,13 +46,16 @@
%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
-Patch1: ufraw-0.11-exiv2.patch
-Patch2: ufraw-0.11-cmserrorhandler.patch
+#BuildRequires: automake libtool
%description
UFRaw is a tool for opening raw format images of digital cameras.
@@ -86,9 +95,7 @@
EOF
%setup -q
-%patch1 -p1 -b .exiv2
-%patch2 -p1 -b .cmserrorhandler
-./autogen.sh
+#./autogen.sh
%build
%configure --with-exiv2 --with-libexif --enable-mime --enable-extras
@@ -99,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 0644 ufraw-mime.xml %buildroot%{_datadir}/mime/packages
+%endif
%find_lang %{name}
@@ -107,8 +118,10 @@
%post %{?spkg:common}
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ufraw.schemas >& /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ufraw.schemas >& /dev/null || :
+%if %pkg_mime_xml
update-mime-database >& /dev/null || :
+%endif
%if %splitpackage
%post
%endif
@@ -119,7 +132,9 @@
gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/ufraw.schemas >& /dev/null || :
%postun %{?spkg:common}
+%if %pkg_mime_xml
update-mime-database >& /dev/null || :
+%endif
%if %splitpackage
%postun
%endif
@@ -128,7 +143,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
@@ -148,6 +165,11 @@
%{gimpplugindir}/ufraw-gimp
%changelog
+* 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
--- ufraw-0.11-cmserrorhandler.patch DELETED ---
--- ufraw-0.11-exiv2.patch DELETED ---
More information about the fedora-extras-commits
mailing list