Author: anaselli
Date: Sat Dec 9 00:48:57 2006
New Revision: 93901
Added:
packages/cooker/kipi-plugins/current/SOURCES/kameraklient.patch.bz2
(contents, props changed)
Modified:
packages/cooker/kipi-plugins/current/SPECS/kipi-plugins.spec
Log:
added patch to fix new libgphoto changes,
fixed spec file
Added: packages/cooker/kipi-plugins/current/SOURCES/kameraklient.patch.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/kipi-plugins/current/SPECS/kipi-plugins.spec
==============================================================================
--- packages/cooker/kipi-plugins/current/SPECS/kipi-plugins.spec
(original)
+++ packages/cooker/kipi-plugins/current/SPECS/kipi-plugins.spec Sat Dec
9 00:48:57 2006
@@ -2,7 +2,10 @@
%define version 0.1.3
%define prerelease beta1
%define release %mkrel 0.%{prerelease}.2
-%define lib_name %mklibname %name
+%define major 0
+%define lib_name %mklibname %name %major
+%define lib_name_devel %mklibname %name %major -d
+
%define Summary KDE image Interface Plugins
Summary: %{Summary}
@@ -13,12 +16,13 @@
Group: System/Libraries
Source0:
http://prdownloads.sourceforge.net/kipi/%{name}-%{version}-%{prerelease}.tar.bz2
Patch0: disable_ipod.patch.bz2
+Patch1: kameraklient.patch.bz2
URL: http://extragear.kde.org/apps/kipi
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: %{lib_name} = %{epoch}:%{version}-%{release}
Requires: mjpegtools
Requires: ImageMagick >= 5.5.4
-Requires: %lib_name = %{version}-%{release}
BuildRequires: libkipi-devel >= 1:0.1.5
BuildRequires: libgpod-devel >= 0.4.0
BuildRequires: libexiv-devel >= 0.12
@@ -45,21 +49,22 @@
%package -n %lib_name
Summary: Library files for %{name}
Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-Provides: %lib_name = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description -n %lib_name
Library files for %{name}
+
#----------------------------------------------------------------------------
-%package -n %lib_name-devel
+%package -n %lib_name_devel
Summary: Development files for %{name}
Group: System/Libraries
-Requires: %{lib_name} = %{version}-%{release}
-Provides: %{name}-devel = %{version}
+Requires: %{lib_name} = %{epoch}:%{version}-%{release}
+Provides: %{name}-devel = %{epoch}:%{version}
+Provides: lib%{name}-devel
-%description -n %lib_name-devel
+%description -n %lib_name_devel
Development files for %{name}
#----------------------------------------------------------------------------
@@ -70,6 +75,8 @@
{
cd kipi-plugins
%patch0 -p0 -b .disable_ipod
+cd kameraklient
+%patch1 -p0 -b .libgphoto
}
%build
@@ -95,7 +102,10 @@
%clean
rm -rf %buildroot
-#----------------------------------------------------------------------------
+%post -n %lib_name -p /sbin/ldconfig
+
+%postun -n %lib_name -p /sbin/ldconfig
+
%files -f %name.lang
%defattr(-,root,root)
@@ -169,7 +179,7 @@
#----------------------------------------------------------------------------
-%files -n %lib_name-devel
+%files -n %lib_name_devel
%defattr(-,root,root)
%{_libdir}/libkipiplugins.so
%{_libdir}/libkipiplugins.la
