Branch: master

8eb2abbc 2014-12-10 12:27:53 François Andriot
update libksquirrel
M redhat/libraries/libkipi/libkipi-14.0.0.spec
M redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec
index d6a48a3..ecce7b2 100644
--- a/redhat/libraries/libkipi/libkipi-14.0.0.spec
+++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec
@@ -49,7 +49,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	library for apps that want to use kipi-plugins (runtime version) [Trinity]
 Group:		System/Libraries
-Epoch:		2
+Epoch:		%{tde_epoch}
 Version:	0.1.5
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
index 6d7bfb8..a601c7a 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
@@ -61,6 +61,7 @@
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Patch0:		%{tde_pkg}-%{tde_version}.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
@@ -511,6 +512,7 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%patch0 -p1
 
 # FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
 if [ -r /usr/include/freetype2/ftbitmap.h ]; then