rpms/kdepim/devel kdepim.spec,1.126,1.127
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Aug 22 11:40:51 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25665
Modified Files:
kdepim.spec
Log Message:
* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
- License: GPLv2
- Provides: kdepim3(-devel)
- (Build)Requires: kdelibs3(-devel)
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- kdepim.spec 19 Jun 2007 20:29:38 -0000 1.126
+++ kdepim.spec 22 Aug 2007 11:40:18 -0000 1.127
@@ -12,10 +12,10 @@
Summary: PIM (Personal Information Manager) for KDE
Epoch: 6
Version: 3.5.7
-Release: 3%{?dist}
+Release: 4%{?dist}
+License: GPLv2
Group: Applications/Productivity
-License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.kde.org
@@ -28,16 +28,20 @@
Patch3: kdepim-3.4.0-kandy-icons.patch
Patch4: kdepim-3.4.92-libz.patch
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Patch115219: kdepim-3.5.7-kde#115219.patch
+
+Provides: kdepim3 = %{version}-%{release}
+
+Requires: kdelibs3 >= %{version}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: bison flex
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-# kmix (?) -- Rex
-BuildRequires: kdemultimedia
-# kttsd
+BuildRequires: kdelibs3-devel >= %{version}
+## kmix (?)
+BuildRequires: kdemultimedia3
+## kttsd
BuildRequires: kdeaccessibility
BuildRequires: zlib-devel
BuildRequires: libart_lgpl-devel
@@ -54,6 +58,7 @@
%endif
%{?_with_gnokii:BuildRequires: gnokii-devel}
## Crypto Stuff from http://kmail.kde.org/kmail-pgpmime-howto.html
+# may have to drop this when/if gpgme becomes LGPLv3
BuildRequires: gpgme-devel
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -82,12 +87,13 @@
A PIM (Personal Information Manager) for KDE.
%package devel
-Summary: Development files for kdepim
+Summary: Development files for %{name}
Group: Development/Libraries
+Provides: kdepim3-devel = %{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+Requires: kdelibs3-devel
%description devel
-Development files for %{name}.
+%{summary}.
Install %{name}-devel if you want to write or compile %{name} plugins.
%prep
@@ -101,6 +107,7 @@
%patch3 -p1 -b .kandy-icons
%patch4 -p1 -b .libz
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -132,6 +139,7 @@
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
@@ -163,6 +171,7 @@
-e "s at -lgpgme@@g" \
-e "s at -lgpg-error@@g"
+
%post
/sbin/ldconfig ||:
for i in crystalsvg hicolor locolor ; do
@@ -179,48 +188,58 @@
done
%{_bindir}/update-desktop-database >& /dev/null ||:
+
%clean
rm -rf %{buildroot}
+
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%doc README korganizer/COPYING
%{_bindir}/*
%{_libdir}/lib*.so.*
+%{_libdir}/lib*.la
%{_libdir}/libakregatorprivate.so
%{_libdir}/libkmailprivate.so
%{_libdir}/libknodecommon.so
-%{_libdir}/lib*.la
%{_libdir}/kde3/*
%{_libdir}/kconf_update_bin/*
%{_datadir}/applications/kde/*
%{_datadir}/applnk/.hidden/*
-%{_datadir}/applnk/Applications
-%{_datadir}/applnk/Utilities
+%{_datadir}/applnk/Applications/*
+%{_datadir}/applnk/Utilities/*
%{_datadir}/apps/*
%{_datadir}/autostart/*
-%config(noreplace) %{_datadir}/config/*
+%{_datadir}/config/*
%{_datadir}/config.kcfg/*
-%doc %{_docdir}/HTML/en/*
-%{_datadir}/icons/*/*/*/*
+%{_datadir}/icons/crystalsvl/*/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/application/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
+%{_docdir}/HTML/en/*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libakregatorprivate.so
%exclude %{_libdir}/libkmailprivate.so
%exclude %{_libdir}/libknodecommon.so
+
%changelog
+* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-4
+- License: GPLv2
+- Provides: kdepim3(-devel)
+- (Build)Requires: kdelibs3(-devel)
+
* Tue Jun 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-3
- +Requires(hint): spambayes (#238650)
* Wed Jun 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
-- +BR: libopensync-devel
+- +BR: libopensync-devel (#244939)
* Wed Jun 13 2007 Than Ngo <than at redhat.com> - 6:3.5.7-1.fc7
- bump release version
More information about the scm-commits
mailing list