rpms/kdepimlibs/devel kdepimlibs.spec,1.5,1.6

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Thu Aug 16 20:56:12 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12190

Modified Files:
	kdepimlibs.spec 
Log Message:
* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
- use macros.kde4
- License: LGPLv2



Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdepimlibs.spec	30 Jul 2007 18:03:17 -0000	1.5
+++ kdepimlibs.spec	16 Aug 2007 20:55:39 -0000	1.6
@@ -2,25 +2,16 @@
 Name: kdepimlibs
 
 Version: 3.92.0
-Release: 2%{?dist}%{?kde}
+Release: 3%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
-License: LGPL
+License: LGPLv2
 Group: System Environment/Libraries
 
 URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} > 7
-# wee!
-%else
-%define _prefix /opt/kde4
-# macros sensitive to _prefix mods
-%define __cmake cmake
-%define _sysconfdir %{_prefix}/etc
-%endif
-
 # use ~/.kde4 instead of ~/.kde
 Patch0: kdepimlibs-%{version}-kde4home.diff
 
@@ -37,6 +28,10 @@
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libXpm-devel libXtst-devel
 BuildRequires: openldap-devel
+BuildRequires: strigi-devel
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
+# extraneous?  add these back to kdelibs4-devel Requires? maybe -- Rex
+BuildRequires: libacl-devel bzip2-devel gamin-devel strigi-devel zlib-devel
 
 %description
 Personal Information Management (PIM) libraries for the
@@ -61,18 +56,12 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
-%if "%{_prefix}" != "/usr"
-%patch0 -p1 -b .kde4home
-%endif
-
 
 %build
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  ../
+%cmake_kde4 ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -95,27 +84,28 @@
 
 %files
 %defattr(-,root,root,-)
-%if "%{_prefix}" != "/usr"
-%dir %{_datadir}/kde4
-%endif
-%{_datadir}/apps/cmake/modules/*
-%{_datadir}/apps/kabc/
-%{_datadir}/apps/kconf_update/*
-%{_datadir}/apps/libical/
-%{_datadir}/config.kcfg/*
+%{_kde4_appsdir}/cmake/modules/*
+%{_kde4_appsdir}/kabc/
+%{_kde4_appsdir}/kconf_update/*
+%{_kde4_appsdir}/libical/
+%{_kde4_datadir}/config.kcfg/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/kde4/services/
-%{_datadir}/kde4/servicetypes/
-%{_libdir}/lib*.so.*
-%{_libdir}/kde4/*
+%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/servicetypes/*
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/kde4/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
 
 
 %changelog
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-4
+- use macros.kde4
+- License: LGPLv2
+
 * Mon Jul 30 2007 Than Ngo <than at redhat.com> 3.92.0-2
 - add BR: gpgme-devel
 




More information about the fedora-extras-commits mailing list