[kdepim] .spec cleanup
Rex Dieter
rdieter at fedoraproject.org
Fri Jul 6 11:53:06 UTC 2012
commit 5de1fc2dce0cdbad2300438bca0abc2f779686d2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jul 6 06:53:05 2012 -0500
.spec cleanup
kdepim.spec | 33 +++++++++++----------------------
1 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/kdepim.spec b/kdepim.spec
index 1d33082..8720f52 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,10 +2,9 @@ Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
Version: 4.8.95
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
-Group: Applications/Productivity
URL: http://www.kde.org/
%global revision %(echo %{version} | cut -d. -f3)
%if %{revision} >= 50
@@ -42,9 +41,9 @@ BuildRequires: gettext
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
BuildRequires: kdepimlibs-devel >= %{version}
-BuildRequires: kdebase-devel >= %{version}
+BuildRequires: kde-baseapps-devel >= %{version}
BuildRequires: libassuan2-devel
-BuildRequires: pkgconfig(akonadi) >= 1.6.0
+BuildRequires: pkgconfig(akonadi)
BuildRequires: pkgconfig(libical)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(python)
@@ -62,7 +61,7 @@ Requires: gnupg
Requires: pinentry-gui
Requires: spambayes
#Requires: spamassassin
-#{?fedora:#Requires: bogofilter}
+#{?fedora:Requires: bogofilter}
%endif
%description
@@ -77,7 +76,6 @@ Requires: spambayes
%package libs
Summary: %{name} runtime libraries
-Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
#{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
%description libs
@@ -85,8 +83,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%package devel
Summary: %{name} development files
-Group: Development/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
%{summary}.
@@ -113,8 +110,6 @@ make %{?_smp_mflags} -C %{_target_platform}
%install
-rm -rf %{buildroot}
-
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# not sure where this is coming from... -- Rex
@@ -146,17 +141,7 @@ if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null ||:
fi
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc README
%doc COPYING
%{_kde4_bindir}/*
@@ -213,19 +198,23 @@ rm -rf %{buildroot}
%{_kde4_docdir}/HTML/en/*
%{_mandir}/man*/*.gz
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
%files libs
-%defattr(-,root,root,-)
%{_kde4_libdir}/lib*.so.*
%{_kde4_libdir}/kde4/plugins/designer/*.so
%{_kde4_libdir}/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
%files devel
-%defattr(-,root,root,-)
%{_kde4_includedir}/*
%{_kde4_libdir}/lib*.so
%changelog
+* Fri Jul 06 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.95-3
+- .spec cleanup
+
* Thu Jul 05 2012 Rex Dieter <rdieter at fedoraproject.org> 7:4.8.95-2
- upstream filter-rework patch
More information about the scm-commits
mailing list