rdieter pushed to kate (f20). "part: Provides: kate4-part%{?_isa}, Obsoletes: kate-libs, %doc COPYING.LIB here"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 16:48:14 UTC 2015
>From 76825daad9cf406fa1e8c0819f61cbf7323d3538 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Wed, 22 Apr 2015 11:47:43 -0500
Subject: part: Provides: kate4-part%{?_isa}, Obsoletes: kate-libs, %doc
COPYING.LIB here
diff --git a/kate.spec b/kate.spec
index 01874e4..dcf3f87 100644
--- a/kate.spec
+++ b/kate.spec
@@ -7,7 +7,7 @@
Name: kate
Summary: Advanced Text Editor
Version: 4.14.3
-Release: 4%{?dist}
+Release: 5%{?dist}
# kwrite LGPLv2+
# kate: app LGPLv2, plugins, LGPLv2 and LGPLv2+ and GPLv2+
@@ -36,7 +36,6 @@ BuildRequires: pkgconfig(QJson)
BuildRequires: pkgconfig(QtWebKit)
Requires: %{name}-part%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?kde_runtime_requires}
%description
@@ -44,19 +43,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%package devel
Summary: Development files for %{name}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+Requires: %{name}-part%{?_isa} = %{version}-%{release}
Requires: kdelibs4-devel
%description devel
%{summary}.
-%package libs
-Summary: Runtime files for %{name}
-# when split occurred
-Obsoletes: kdesdk-libs < 4.6.95-10
-Requires: %{name} = %{version}-%{release}
-%description libs
-%{summary}.
-
%if 0%{?pate}
%package pate
Summary: Kate python plugin
@@ -85,7 +76,12 @@ License: LGPLv2
Conflicts: kdelibs < 6:4.6.95-10
# katesyntaxhighlightingrc conflicts with kdelibs3, see http://bugzilla.redhat.com/883529
Conflicts: kdelibs3 < 3.5.10-40
+Obsoletes: kate-libs < 4.14.3-5
+## nothing else should depend on -libs, so skip Provides for now -- rex
+#Provides: kate-libs = %{version}-%{release}
+#Provides: kate-libs%{?_isa} = %{version}-%{release}
Provides: kate4-part = %{version}-%{release}
+Provides: kate4-part%{?_isa} = %{version}-%{release}
%description part
%{summary}.
@@ -164,7 +160,6 @@ update-desktop-database -q &> /dev/null || :
fi
%files -f kate.lang
-%doc COPYING.LIB
%doc AUTHORS README
%{_kde4_bindir}/kate
%{_kde4_libdir}/libkdeinit4_kate.so
@@ -191,12 +186,6 @@ fi
%{_kde4_libdir}/kde4/plasma_applet_katesession.so
%{_kde4_libdir}/kde4/kate_kttsd.so
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%files libs
-%{_kde4_libdir}/libkateinterfaces.so.4*
-
%files devel
%{_kde4_libdir}/kde4/devel/libkateinterfaces.so
%{_kde4_libdir}/kde4/devel/libkatepartinterfaces.so
@@ -207,7 +196,8 @@ fi
%postun part -p /sbin/ldconfig
%files part
-%doc part/INDENTATION part/README* part/TODO*
+%doc COPYING.LIB
+%doc part/INDENTATION part/README*
%{_kde4_libdir}/kde4/katepart.so
%{_kde4_libdir}/libkatepartinterfaces.so.4*
%{_kde4_appsdir}/katepart/
@@ -243,6 +233,9 @@ fi
%changelog
+* Wed Apr 22 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-5
+- -part: Provides: kate4-part%%{?_isa}, Obsoletes: kate-libs, %%doc COPYING.LIB here
+
* Thu Feb 19 2015 Rex Dieter <rdieter at fedoraproject.org> 4.14.3-4
- kwrite: use %%{?kde_runtime_requires}
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/kate.git/commit/?h=f20&id=76825daad9cf406fa1e8c0819f61cbf7323d3538
More information about the scm-commits
mailing list