From b283fb3b9b6d71a2e83e5f1086969a5c69248752cd7a4cc26bbf9dedbb830593 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 9 May 2015 19:27:31 +0000 Subject: [PATCH] reenable build for <= 13.1 (No QT5) OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=30 --- freeciv.changes | 5 +++++ freeciv.spec | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/freeciv.changes b/freeciv.changes index 3cba0fa..f30a3c8 100644 --- a/freeciv.changes +++ b/freeciv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 9 19:27:23 UTC 2015 - opensuse@dstoecker.de + +- reenable build for <= 13.1 (No QT5) + ------------------------------------------------------------------- Mon Mar 16 13:57:30 UTC 2015 - adrian@suse.de diff --git a/freeciv.spec b/freeciv.spec index 14459dd..0d25dc4 100644 --- a/freeciv.spec +++ b/freeciv.spec @@ -25,12 +25,16 @@ Group: Amusements/Games/Strategy/Turn Based Url: http://www.freeciv.org Source0: http://download.gna.org/freeciv/stable/%{name}-%{version}.tar.bz2 Source1: freeciv-gtk3.desktop +%if 0%{?suse_version} >= 1320 Source2: freeciv-qt.desktop +%endif Source3: freeciv.png Source4: freeciv-manual Source5: freeciv-manual.desktop Source6: freeciv-manual.png +%if 0%{?suse_version} >= 1320 Patch1: fix-qt5-detection.patch +%endif Requires: freeciv_client-%version BuildRequires: SDL_mixer-devel BuildRequires: audiofile-devel @@ -42,8 +46,10 @@ BuildRequires: gcc-c++ BuildRequires: gtk3-devel BuildRequires: libbz2-devel BuildRequires: libggz2-devel +%if 0%{?suse_version} >= 1320 BuildRequires: libqt5-qtbase-common-devel BuildRequires: libqt5-qtbase-devel +%endif BuildRequires: libtool BuildRequires: readline-devel BuildRequires: update-desktop-files @@ -60,6 +66,7 @@ exchange or (more often) the extinction of all other civilizations. To start a new game, first start the server 'civserver,' then start the client 'civclient'. Have fun! +%if 0%{?suse_version} >= 1320 %package qt Summary: Qt client for freeciv Group: Amusements/Games/Strategy/Turn Based @@ -68,12 +75,14 @@ Requires: freeciv = %version %description qt Freeciv executable using Qt library +%endif %package gtk3 Summary: Gtk3 client for freeciv Group: Amusements/Games/Strategy/Turn Based Provides: freeciv_client-%version Requires: freeciv = %version +Replaces: freeciv-gtk2 %description gtk3 Freeciv executable using Gtk3 library @@ -81,15 +90,23 @@ Freeciv executable using Gtk3 library %prep %setup -q +%if 0%{?suse_version} >= 1320 %patch1 +%endif echo "X-SuSE-translate=false" >> bootstrap/freeciv-server.desktop.in echo "X-SuSE-translate=false" >> bootstrap/freeciv-modpack.desktop.in %build +%if 0%{?suse_version} >= 1320 export MOCCMD="moc-qt5" +%endif autoreconf -fi %configure \ +%if 0%{?suse_version} >= 1320 --enable-client=gtk3,qt \ +%else + --enable-client=gtk3 \ +%endif --with-readline \ --disable-static \ --docdir=%{_docdir}/freeciv @@ -102,7 +119,9 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps/ install -m 644 $RPM_SOURCE_DIR/*.png %{buildroot}%{_datadir}/pixmaps rm %{buildroot}%{_datadir}/applications/%{name}.desktop %suse_update_desktop_file -i %{name}-gtk3 Game StrategyGame +%if 0%{?suse_version} >= 1320 %suse_update_desktop_file -i %{name}-qt Game StrategyGame +%endif %suse_update_desktop_file -i freeciv-manual Game StrategyGame %if 0%{?sles_version} == 11 rm -rf %{buildroot}/%{_datadir}/locale/no @@ -156,9 +175,11 @@ rm -rf %{buildroot}/%{_datadir}/locale/no %{_datadir}/applications/%{name}-gtk3.desktop /usr/share/applications/freeciv-mp-gtk3.desktop +%if 0%{?suse_version} >= 1320 %files qt %defattr(-,root,root) %{_bindir}/freeciv-qt %{_datadir}/applications/%{name}-qt.desktop +%endif %changelog