rpms/ufraw/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 ufraw.spec, 1.32, 1.33

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/ufraw/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15580

Modified Files:
	.cvsignore sources ufraw.spec 
Log Message:
version 0.14.1
use %bcond_with/without macros



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Nov 2007 11:51:09 -0000	1.9
+++ .cvsignore	1 Dec 2008 15:59:05 -0000	1.10
@@ -1 +1 @@
-ufraw-0.13.tar.gz
+ufraw-0.14.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Nov 2007 11:51:09 -0000	1.9
+++ sources	1 Dec 2008 15:59:05 -0000	1.10
@@ -1 +1 @@
-6470f787a8f62f6e1642161e3c8d557b  ufraw-0.13.tar.gz
+cc204ecc7009b947a265391bd3aec236  ufraw-0.14.1.tar.gz


Index: ufraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ufraw/F-9/ufraw.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ufraw.spec	4 Jul 2008 12:16:37 -0000	1.32
+++ ufraw.spec	1 Dec 2008 15:59:05 -0000	1.33
@@ -1,43 +1,49 @@
-%define gimptool %{_bindir}/gimptool-2.0
-%define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
-
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
-%define cinepaint 0%{!?_without_cinepaint:1}
+%bcond_without cinepaint
 %else
-%define cinepaint 0%{?_with_cinepaint:1}
-%endif
-
-%if %cinepaint
-%define cinepaintplugindir %(pkg-config --variable=programplugindir cinepaint-gtk)/plug-ins
+%bcond_with cinepaint
 %endif
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-%define splitpackage 0%{!?_without_splitpackage:1}
+%bcond_without splitpackage
 %else
-%define splitpackage 0%{?_with_splitpackage:1}
+%bcond_with splitpackage
 %endif
 
 %if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 5
-%define pkg_mime_xml 0%{!?_without_pkg_mime_xml:1}
+%bcond_without pkg_mime_xml
 %else
-%define pkg_mime_xml 0%{?_with_pkg_mime_xml:1}
+%bcond_with pkg_mime_xml
 %endif
 
-%if %splitpackage
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 11 || 0%{?rhel} >= 6
+%bcond_without lensfun
+%else
+%bcond_with lensfun
+%endif
+
+%if %{with splitpackage}
 %define spkg 1
 %endif
 
+%define gimptool %{_bindir}/gimptool-2.0
+%define gimpplugindir %(%gimptool --gimpplugindir)/plug-ins
+
+%if %{with cinepaint}
+%define cinepaintplugindir %(pkg-config --variable=programplugindir cinepaint-gtk)/plug-ins
+%endif
+
 Summary: Raw image data retrieval tool for digital cameras
 Name: ufraw
-Version: 0.13
-Release: 6%{?dist}
+Version: 0.14.1
+Release: 1%{?dist}
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://ufraw.sourceforge.net
 Source0: http://download.sourceforge.net/ufraw/ufraw-%{version}.tar.gz
 BuildRequires: gimp-devel >= 2.0
 BuildRequires: gimp >= 2.0
-%if %cinepaint
+%if %{with cinepaint}
 BuildRequires: cinepaint-devel >= 0.22
 BuildRequires: cinepaint >= 0.22
 %endif
@@ -46,6 +52,9 @@
 BuildRequires: lcms-devel
 BuildRequires: libexif-devel >= 0.6.13
 BuildRequires: exiv2-devel >= 0.11
+%if %{with lensfun}
+BuildRequires: lensfun-devel >= 0.2.3
+%endif
 BuildRequires: libtiff-devel 
 BuildRequires: libjpeg-devel
 BuildRequires: pkgconfig >= 0.9.0
@@ -54,14 +63,14 @@
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
-%if %splitpackage
+%if %{with splitpackage}
 Requires: ufraw-common = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: ufraw < 0.10
 Conflicts: ufraw < 0.10
 %else
 Requires(post): GConf2
 Requires(preun): GConf2
-%if %pkg_mime_xml
+%if %{with pkg_mime_xml}
 Requires(post): shared-mime-info < 0.21
 Requires(postun): shared-mime-info < 0.21
 %else
@@ -76,7 +85,7 @@
 %description
 UFRaw is a tool for opening raw format images of digital cameras.
 
-%if %splitpackage
+%if %{with splitpackage}
 %package common
 Summary: Common files needed by UFRaw
 Group: Applications/Multimedia
@@ -101,7 +110,7 @@
 The ufraw-gimp package contains a GIMP plugin for opening raw format images of
 digital cameras.
 
-%if %cinepaint
+%if %{with cinepaint}
 %package cinepaint
 Summary: CinePaint plugin to retrieve raw image data from digital cameras
 Group: Applications/Multimedia
@@ -119,8 +128,10 @@
 cat << EOF
 
 Building UFRaw with these settings:
-cinepaint:      %cinepaint
-splitpackage:   %splitpackage
+cinepaint:      %{with cinepaint}
+splitpackage:   %{with splitpackage}
+pkg_mime_xml:   %{with pkg_mime_xml}
+lensfun:        %{with lensfun}
 
 EOF
 %setup -q
@@ -128,7 +139,13 @@
 #./autogen.sh
 
 %build
-%configure --with-exiv2 --with-libexif --enable-mime --enable-extras
+%configure \
+%if %{with lensfun}
+    --enable-lensfun \
+%endif
+    --with-exiv2 --with-libexif --enable-mime --enable-extras \
+    --enable-contrast
+
 make schemasdir=%{_sysconfdir}/gconf/schemas
 
 %install
@@ -136,7 +153,7 @@
 make DESTDIR=%buildroot schemasdir=%{_sysconfdir}/gconf/schemas install
 # don't ship dcraw binary
 rm -f %{buildroot}%{_bindir}/dcraw
-%if %pkg_mime_xml
+%if %{with pkg_mime_xml}
 install -d -m 0755 %buildroot%{_datadir}/mime/packages
 install -m 0644 ufraw-mime.xml %buildroot%{_datadir}/mime/packages
 %endif
@@ -149,10 +166,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 || :
-%if %pkg_mime_xml
+%if %{with pkg_mime_xml}
 update-mime-database >& /dev/null || :
 %endif
-%if %splitpackage
+%if %{with splitpackage}
 %post
 %endif
 update-desktop-database >& /dev/null || :
@@ -162,10 +179,10 @@
 gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/ufraw.schemas >& /dev/null || :
 
 %postun %{?spkg:common}
-%if %pkg_mime_xml
+%if %{with pkg_mime_xml}
 update-mime-database >& /dev/null || :
 %endif
-%if %splitpackage
+%if %{with splitpackage}
 %postun
 %endif
 update-desktop-database >& /dev/null || :
@@ -173,12 +190,12 @@
 %files %{?spkg:common} -f %{name}.lang
 %defattr(-, root, root, -)
 %doc COPYING README
-%if %pkg_mime_xml
+%if %{with pkg_mime_xml}
 %{_datadir}/mime/packages/ufraw-mime.xml
 %endif
 %{_sysconfdir}/gconf/schemas/ufraw.schemas
 
-%if %splitpackage
+%if %{with splitpackage}
 %files
 %defattr(-, root, root, -)
 %endif
@@ -187,21 +204,28 @@
 %_datadir/applications/*.desktop
 %_mandir/man1/*
 
-%if %splitpackage
+%if %{with splitpackage}
 %files gimp
 %defattr(-, root, root, -)
 %endif
 %dir %{gimpplugindir}
 %{gimpplugindir}/ufraw-gimp
 
-%if %splitpackage
+%if %{with cinepaint}
+%if %{with splitpackage}
 %files cinepaint
 %defattr(-, root, root, -)
 %endif
 %dir %{cinepaintplugindir}
 %{cinepaintplugindir}/ufraw-cinepaint
+%endif
 
 %changelog
+* Fri Nov 28 2008 Nils Philippsen <nils at redhat.com> - 0.14.1-1
+- version 0.14.1
+- use %%bcond_with/without macros
+- enable building with lensfun from F11 on
+
 * Fri Jul 04 2008 Nils Philippsen <nphilipp at redhat.com> - 0.13-6
 - rebuild with gtkimageview-1.6.1