rdieter pushed to libkdegames (f22). "drop libkdegames4, Provides: libkdegames-kf5(-devel)"

Fri Apr 17 15:38:32 UTC 2015

>From 5e1244ea5fd06c05686bbf1874b6b5182d156aff Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 17 Apr 2015 08:40:28 -0500
Subject: drop libkdegames4, Provides: libkdegames-kf5(-devel)

diff --git a/.gitignore b/.gitignore
index ed8b629..a9b9028 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1 @@
-/libkdegames-4.10.1.tar.xz
-/libkdegames-4.10.2.tar.xz
-/libkdegames-4.10.3.tar.xz
-/libkdegames-4.10.4.tar.xz
-/libkdegames-4.10.90.tar.xz
-/libkdegames-4.10.95.tar.xz
-/libkdegames-4.10.97.tar.xz
-/libkdegames-4.11.0.tar.xz
-/libkdegames-4.11.1.tar.xz
-/libkdegames-4.11.2.tar.xz
-/libkdegames-4.11.3.tar.xz
-/libkdegames-4.11.90.tar.xz
-/libkdegames-4.11.95.tar.xz
-/libkdegames-4.11.97.tar.xz
-/libkdegames-4.12.0.tar.xz
-/libkdegames-4.12.1.tar.xz
-/libkdegames-4.12.2.tar.xz
-/libkdegames-4.12.3.tar.xz
-/libkdegames-4.12.90.tar.xz
-/libkdegames-4.12.95.tar.xz
-/libkdegames-4.12.97.tar.xz
-/libkdegames-4.13.0.tar.xz
-/libkdegames-4.13.1.tar.xz
-/libkdegames-4.13.2.tar.xz
-/libkdegames-4.13.3.tar.xz
-/libkdegames-4.13.97.tar.xz
-/libkdegames-4.14.0.tar.xz
-/libkdegames-4.14.1.tar.xz
-/libkdegames-4.14.2.tar.xz
-/libkdegames-4.14.3.tar.xz
-/libkdegames-14.11.97.tar.xz
-/libkdegames-14.12.1.tar.xz
-/libkdegames-14.12.2.tar.xz
-/libkdegames-14.12.3.tar.xz
 /libkdegames-15.04.0.tar.xz
diff --git a/libkdegames.spec b/libkdegames.spec
index d5516ef..ac5f679 100644
--- a/libkdegames.spec
+++ b/libkdegames.spec
@@ -1,18 +1,10 @@
 
 %{!?_licensedir:%global license %%doc}
 
-# build libkdegames4 compat pkg
-%define libkdegames4 1
-%define libkdegames4_version 14.12.3
-# note: must be monotonically increasing for every version/release bump below
-%define libkdegames4_release 3
-
-%define libkdegames_version 15.04.0
-
 Name:    libkdegames
 Summary: Common code and data for many KDE games
-Version: %{libkdegames_version}
-Release: 3%{?dist}
+Version: 15.04.0
+Release: 4%{?dist}
 
 # libKF5KDEGames is LGPLv2, libKF5KDEGamesPrivate is GPLv2+
 License: LGPLv2 and GPLv2+
@@ -23,10 +15,7 @@ URL:     https://projects.kde.org/projects/kde/kdegames/libkdegames
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/applications/%{version}/src/libkdegames-%{libkdegames_version}.tar.xz
-%if 0%{?libkdegames4}
-Source1: http://download.kde.org/%{stable}/applications/%{version}/src/libkdegames-%{libkdegames4_version}.tar.xz
-%endif
+Source0: http://download.kde.org/%{stable}/applications/%{version}/src/libkdegames-%{version}.tar.xz
 
 BuildRequires: extra-cmake-modules
 BuildRequires: gettext
@@ -63,10 +52,10 @@ BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgco
 BuildRequires: pkgconfig(openal)
 BuildRequires: pkgconfig(sndfile)
 
+Provides: libkdegames-kf5 = %{version}-%{release}
+Provides: libkdegames-kf5%{?_isa} = %{version}-%{release}
+
 %filter_provides_in %{_qt5_archdatadir}/qml/org/kde
-%if 0%{?libkdegames4}
-%filter_provides_in %{_kde4_libdir}/kde4/imports/org/kde
-%endif
 %filter_setup
 
 %description
@@ -74,6 +63,8 @@ BuildRequires: pkgconfig(sndfile)
 
 %package devel
 Summary:  Development files for %{name} 
+Provides: libkdegames-kf5-devel = %{version}-%{release}
+Provides: libkdegames-kf5-devel%{?_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig(Qt5Network) pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Xml)
 Requires: kf5-kconfig-devel
@@ -85,36 +76,9 @@ Requires: kf5-kwidgetsaddons-devel
 %description devel
 %{summary}.
 
-%if 0%{?libkdegames4}
-%package -n libkdegames4
-Summary:   Common code and data for many KDE4 games
-Version:   %{libkdegames4_version}
-Release:   %{libkdegames4_release}%{?dist}
-BuildRequires: kdelibs4-devel >= 4.14
-Obsoletes: kdegames-libs < 6:4.9.60
-Provides:  kdegames-libs = 6:%{libkdegames4_version}-%{libkdegames4_release}
-Provides:  kdegames-libs%{?_isa} = 6:%{libkdegames4_version}-%{libkdegames4_release}
-%{?kdelibs4_requires}
-%description -n libkdegames4
-%{summary}.
-
-%package -n libkdegames4-devel
-Summary:  Development files for %{name}
-Version:   %{libkdegames4_version}
-Release:   %{libkdegames4_release}%{?dist}
-Requires: libkdegames4%{?_isa} = %{version}-%{release}
-Requires: kdelibs4-devel
-Obsoletes: kdegames-devel < 6:4.9.60
-Provides:  kdegames-devel = 6:%{libkdegames4_version}-%{libkdegames4_release}
-Provides:  kdegames4-devel = %{libkdegames4_version}-%{libkdegames4_release}
-%description -n libkdegames4-devel
-%{summary}.
-%endif
-
-
 
 %prep
-%setup -q -n libkdegames-%{libkdegames_version} %{?libkdegames4:-a 1}
+%setup -q
 
 
 %build
@@ -125,22 +89,8 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
-%if 0%{?libkdegames4}
-mkdir libkdegames-%{libkdegames4_version}/%{_target_platform}
-pushd libkdegames-%{libkdegames4_version}/%{_target_platform}
-%{cmake_kde4} ..
-
-make %{?_smp_mflags}
-popd
-%endif
-
 
 %install
-# install this one first, in case there are any conflicts
-%if 0%{?libkdegames4}
-make install/fast DESTDIR=%{buildroot} -C libkdegames-%{libkdegames4_version}/%{_target_platform}
-%endif
-
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
@@ -163,35 +113,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_includedir}/KF5KDEGames/
 %{_kf5_libdir}/cmake/KF5KDEGames/
 
-%if 0%{?libkdegames4}
-%post -n libkdegames4 -p /sbin/ldconfig
-%postun -n libkdegames4 -p /sbin/ldconfig
-
-%files -n libkdegames4
-%doc README TODO
-%license COPYING
-%{_kde4_libdir}/libkdegames.so.6*
-%{_kde4_libdir}/libkdegamesprivate.so.1*
-%dir %{_kde4_libdir}/kde4/imports/org
-%dir %{_kde4_libdir}/kde4/imports/org/kde
-%{_kde4_libdir}/kde4/imports/org/kde/games/
-%{_kde4_appsdir}/carddecks/
-%{_kde4_appsdir}/kconf_update/kgthemeprovider-migration.upd
-
-%files -n libkdegames4-devel
-%{_kde4_includedir}/*.h
-%{_kde4_includedir}/highscore/
-%{_kde4_includedir}/KDE/*
-%{_kde4_includedir}/libkdegamesprivate/
-%{_kde4_libdir}/cmake/KDEGames/
-%{_kde4_libdir}/libkdegames.so
-%{_kde4_libdir}/libkdegamesprivate.so
-%endif
-
 
 %changelog
-* Thu Apr 16 2015 Rex Dieter <rdieter at fedoraproject.org> 
-- 15.04.0-3
+* Fri Apr 17 2015 Rex Dieter <rdieter at fedoraproject.org>  15.04.0-4
+- drop libkdegames4, Provides: libkdegames-kf5(-devel)
+
+* Thu Apr 16 2015 Rex Dieter <rdieter at fedoraproject.org> - 15.04.0-3
 - License: LGPLv2 and GPLv2+
 - use %%license tag
 - include compat libkdegames4 here (temporary?)
diff --git a/sources b/sources
index f68331c..49fb68d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 876a27db04ac8d957c62779dfa8f81e4  libkdegames-15.04.0.tar.xz
-a17f866a85fd7daac61abd5d0aab2b12  libkdegames-14.12.3.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libkdegames.git/commit/?h=f22&id=5e1244ea5fd06c05686bbf1874b6b5182d156aff
