[kalgebra] drop BR: readline-devel (needed only for analitza, now packaged separately)
Rex Dieter
rdieter at fedoraproject.org
Sat Dec 3 21:34:30 UTC 2011
commit 8b2456da0a4a39254b799c44c40714cf4c99f497
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Dec 3 15:35:06 2011 -0600
drop BR: readline-devel (needed only for analitza, now packaged separately)
kalgebra.spec | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
---
diff --git a/kalgebra.spec b/kalgebra.spec
index 8b0a098..1bc20d6 100644
--- a/kalgebra.spec
+++ b/kalgebra.spec
@@ -8,25 +8,21 @@ License: GPLv2+
URL: https://projects.kde.org/projects/kde/kdeedu/%{name}
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+BuildRequires: analitza-devel >= %{version}
BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: libkdeedu-devel >= %{version}
BuildRequires: libkdeedu-static
-BuildRequires: readline-devel
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: analitza%{?_isa} >= %{version}
+Requires: libkdeedu%{?_isa} >= %{version}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-%description
-%{summary}.
+# put this in analitza pkg instead? -- rex
+Obsoletes: kalgebra-libs < 4.7.80
-%package libs
-Summary: Runtime files for %{name}
-# when split occurred
-Conflicts: kdeedu-math-libs < 4.7.0-10
-Requires: libkdeedu%{?_isa} >= %{version}
-Requires: %{name} = %{version}-%{release}
-%description libs
+
+%description
%{summary}.
@@ -48,9 +44,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%find_lang %{name} --with-kde --without-mo
-## unpackaged files
-rm -fv %{buildroot}%{_kde4_libdir}/libanalitza*.so
-
%check
desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
@@ -70,7 +63,6 @@ fi
%files -f %{name}.lang
%doc COPYING TODO
-%{_kde4_bindir}/calgebra
%{_kde4_bindir}/kalgebra
%{_kde4_bindir}/kalgebramobile
%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
@@ -85,17 +77,11 @@ fi
%{_kde4_datadir}/kde4/services/kalgebra*.desktop
%{_kde4_datadir}/kde4/servicetypes/kalgebrascript.desktop
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%{_kde4_libdir}/libanalitza.so.*
-%{_kde4_libdir}/libanalitzagui.so.*
-
%changelog
* Fri Nov 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.80-1
- 4.7.80
+- BR: analitza-devel
* Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-1
- 4.7.3
More information about the scm-commits
mailing list