rdieter pushed to libkdegames (master). "15.04.0-3 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 14:56:19 UTC 2015 

>From b0b5cb429acb9af4bca2150b0def92fda9433096 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 16 Apr 2015 09:56:13 -0500
Subject: 15.04.0-3

- License: LGPLv2 and GPLv2+
- use %license tag
- include compat libkdegames4 here (temporary?)
- filter qml module provides

diff --git a/libkdegames.spec b/libkdegames.spec
index 7540768..d5516ef 100644
--- a/libkdegames.spec
+++ b/libkdegames.spec
@@ -1,19 +1,32 @@
 
+%{!?_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: 15.04.0
-Release: 2%{?dist}
+Version: %{libkdegames_version}
+Release: 3%{?dist}
 
-# KDE e.V. may determine that future GPL versions are accepted
-License: GPLv2 or GPLv3
-URL:     https://projects.kde.org/projects/kde/kdegames/%{name}
+# libKF5KDEGames is LGPLv2, libKF5KDEGamesPrivate is GPLv2+
+License: LGPLv2 and GPLv2+
+URL:     https://projects.kde.org/projects/kde/kdegames/libkdegames
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
 %global stable unstable
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
+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
 
 BuildRequires: extra-cmake-modules
 BuildRequires: gettext
@@ -50,11 +63,10 @@ BuildRequires: pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgco
 BuildRequires: pkgconfig(openal)
 BuildRequires: pkgconfig(sndfile)
 
-Obsoletes: kdegames-libs < 6:4.9.60
-Provides:  kdegames-libs = 6:%{version}-%{release}
-Provides:  kdegames-libs%{?_isa} = 6:%{version}-%{release}
-
-%filter_provides_in %{_qt5_archdatadir}/
+%filter_provides_in %{_qt5_archdatadir}/qml/org/kde
+%if 0%{?libkdegames4}
+%filter_provides_in %{_kde4_libdir}/kde4/imports/org/kde
+%endif
 %filter_setup
 
 %description
@@ -63,8 +75,6 @@ Provides:  kdegames-libs%{?_isa} = 6:%{version}-%{release}
 %package devel
 Summary:  Development files for %{name} 
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: kdegames-devel < 6:4.9.60
-Provides:  kdegames-devel = 6:%{version}-%{release}
 Requires: pkgconfig(Qt5Network) pkgconfig(Qt5Widgets) pkgconfig(Qt5Qml) pkgconfig(Qt5QuickWidgets) pkgconfig(Qt5Xml)
 Requires: kf5-kconfig-devel
 Requires: kf5-kconfigwidgets-devel
@@ -75,9 +85,36 @@ 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
+%setup -q -n libkdegames-%{libkdegames_version} %{?libkdegames4:-a 1}
 
 
 %build
@@ -88,8 +125,22 @@ 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}
 
 
@@ -97,12 +148,14 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %postun -p /sbin/ldconfig
 
 %files
-%doc COPYING README TODO
+%doc README TODO
+%license COPYING
 %{_kf5_libdir}/libKF5KDEGames.so.6*
 %{_kf5_libdir}/libKF5KDEGamesPrivate.so.*
-%{_kf5_datadir}/carddecks/
 %{_qt5_archdatadir}/qml/org/kde/games/
 %{_kf5_datadir}/kconf_update/kgthemeprovider-migration.upd
+# consider common/noarch subpkg
+%{_kf5_datadir}/carddecks/
 
 %files devel
 %{_kf5_libdir}/libKF5KDEGames.so
@@ -110,8 +163,40 @@ 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
+- License: LGPLv2 and GPLv2+
+- use %%license tag
+- include compat libkdegames4 here (temporary?)
+- filter qml module provides
+
 * Tue Apr 14 2015 Rex Dieter <rdieter at fedoraproject.org> 15.04.0-2
 - -devel: add cmake deps
 
@@ -231,4 +316,3 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 * Thu Feb 07 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.0-1
 - first try
-
diff --git a/sources b/sources
index 49fb68d..f68331c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 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=master&id=b0b5cb429acb9af4bca2150b0def92fda9433096

More information about the scm-commits mailing list