- added gcc4 patch, fixed ca locale dir, release 2

[packages/hugin.git] / hugin.spec

diff --git a/hugin.spec b/hugin.spec
index d96e29e32e328c19c7d33198fc87091e43e4ea6e..9351424a8d6c11fbe607b0ea2945c946c0132de9 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,13 +2,14 @@ Summary:      Toolchain to create panoramic images
 Summary(pl):   Zestaw narzêdzi do tworzenia panoramicznych zdjêæ
 Name:          hugin
 Version:       0.5
 Summary(pl):   Zestaw narzêdzi do tworzenia panoramicznych zdjêæ
 Name:          hugin
 Version:       0.5

-Release:       1
+Release:       2

 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
 # Source0-md5: 18b38f5d6744831567b7fabfedb643fd
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-defaults.patch
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/hugin/%{name}-%{version}.tar.gz
 # Source0-md5: 18b38f5d6744831567b7fabfedb643fd
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-defaults.patch

+Patch2:                %{name}-gcc4.patch

 URL:           http://hugin.sf.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 URL:           http://hugin.sf.net/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake


@@ -49,6 +50,7 @@ pakiety tak
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %setup -q
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 
 sed -i -e 's,ac_boost_libdir=.*/lib.*,ac_boost_libdir=/usr/%{_lib},' m4/ax_check_boost.m4
 
 
 sed -i -e 's,ac_boost_libdir=.*/lib.*,ac_boost_libdir=/usr/%{_lib},' m4/ax_check_boost.m4
 


@@ -72,6 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

+mv $RPM_BUILD_ROOT%{_datadir}/locale/{ca_ES,ca}
+

 # "hugin" and "nona_gui" domains
 %find_lang %{name} --all-name
 
 # "hugin" and "nona_gui" domains
 %find_lang %{name} --all-name