[luminance-hdr/f17] Revert "Updated spec file"

Franco Comida fcomida at fedoraproject.org
Wed Jul 18 12:55:58 UTC 2012


commit c0ca6a346d92546f33c54c93a55e0839bff401fa
Author: Franco Comida <francocomida at google.com>
Date:   Thu Jul 5 04:08:54 2012 +0100

    Revert "Updated spec file"
    
    This reverts commit 14a0dbcc2c4bfdf9630286ad06426a91721e26ee.
    
    Conflicts:
    
    	.gitignore
    	luminance-hdr.spec
    	sources

 .gitignore         |    5 +----
 luminance-hdr.spec |   13 +++++--------
 sources            |    2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e363c9..9bceaf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-*.project
-CMakeLists.txt.user
-/.settings
-**.rule/luminance-hdr-2.3.0.tar.bz2
+/luminance-hdr-2.2.1.tar.bz2
diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index 228c1a7..92b3093 100644
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -1,12 +1,13 @@
 Name: luminance-hdr
-Version: 2.3.0
-Release: 1%{?dist}
+Version: 2.2.1
+Release: 2%{?dist}
 Summary: A graphical tool for creating and tone-mapping HDR images
 
 Group: Applications/Productivity
 License: GPLv2+
 URL: http://qtpfsgui.sourceforge.net/
 Source0: http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
+Patch0: desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel
@@ -20,8 +21,6 @@ BuildRequires: gsl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: cmake
 BuildRequires: LibRaw-devel
-BuildRequires: libpng-devel
-BuildRequires: lcms2-devel
 
 Obsoletes: qtpfsgui < 2.2.0
 Provides: qtpfsgui = %{version}-%{release}
@@ -35,13 +34,14 @@ operators for creating low dynamic range versions of HDR images.
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch0 -p0
 
 # fix inconsistant newlines
 %{__sed} -i 's/\r//' Changelog
 
 
 %build
-%{cmake} -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE=Release .
+%{cmake} -DBUILD_SHARED_LIBS:BOOL=OFF .
 
 make %{?_smp_mflags}
 
@@ -91,9 +91,6 @@ fi
 
 
 %changelog
-* Sun Jul 01 2012 Franco Comida <francocomida at googlemail.com> - 2.3.0-1
-- Updated to Luminance HDR 2.3.0
-
 * Wed Mar 28 2012 Dan HorĂ¡k <dan[at]danny.cz> - 2.2.1-3
 - fix build on non-x86 arches
 
diff --git a/sources b/sources
index 5ec4226..d526d32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-646f93479039cf34f18581008b19ca79  luminance-hdr-2.3.0.tar.bz2
+9c64d89bda6cea685d1158dd3cbc823b  luminance-hdr-2.2.1.tar.bz2


More information about the scm-commits mailing list