Update OBS spec file to current version

The old one was a) outdated and b) didn't work with cmake so it was rather misleading to have here. Signed-off-by: Dirk Hohndel <[email protected]>
abentley · Apr 8, 2015 · 9f532ed · 9f532ed
1 parent 069b4b2
commit 9f532ed
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec
@@ -4,21 +4,16 @@
 # Copyright (c) 2014 Dirk Hohndel
 #
 
-%define latestVersion 4.3
-
-
-%define gitVersion 155
-
-
+%define latestVersion 4.4.1.363
 
 Name:           subsurfacedaily
-Version:	%latestVersion.%gitVersion
+Version:	%latestVersion
 Release:	0
 License:	GPL v2
 Summary:	Open source dive log
 Url:		http://subsurface-divelog.org
 Group:		Productivity/Other
-Source:		subsurfacedaily-%latestVersion.%gitVersion.orig.tar.xz
+Source:		subsurface-%latestVersion.orig.tar.xz
 Conflicts:	subsurface
 BuildRequires:	desktop-file-utils
 BuildRequires:	fdupes
@@ -36,9 +31,8 @@ BuildRequires:  kde4-filesystem
 BuildRequires:	libzip-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
-BuildRequires:	libgit2-devel
-# for libgit2
 %if  0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires:	netpbm-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libsqlite3x-devel
 BuildRequires:	libusbx-devel
@@ -60,13 +54,21 @@ BuildRequires:	sqlite3-devel
 BuildRequires:	libusb-1_0-devel
 BuildRequires:	libqt5-qtbase-devel
 BuildRequires:	libqt5-qtsvg-devel
+BuildRequires:	libqt5-linguist
 BuildRequires:	libqt5-linguist-devel
 BuildRequires:	libqt5-qttools-devel
 BuildRequires:	libQt5WebKit5-devel
 BuildRequires:	libQt5WebKitWidgets-devel
 BuildRequires:	libqt5-qtscript-devel
 BuildRequires:	libqt5-qtdeclarative-devel
 %endif
+# Recommends Qt5 translations package
+%if 0%{?suse_version}
+Recommends:     libqt5-qttranslations
+%endif
+%if  0%{?fedora_version} >= 21
+Recommends:     qt5-qttranslations
+%endif
 BuildRoot:      %{_tmppath}/subsurface%{version}-build
 
 %description
@@ -77,21 +79,30 @@ This is the official Subsurface build, including our own custom libdivecomputer
 
 %build
 (cd libdivecomputer ; autoreconf --install ; ./configure --disable-shared ; make %{?_smp_mflags} )
+(cd libgit2; mkdir build; cd build; cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_CLAR=OFF .. ; make )
 (mkdir marble-build ; cd marble-build ; \
 	cmake -DQTONLY=ON -DQT5BUILD=ON \
 		-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
 		-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
 		-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
 		-DBUILD_WITH_DBUS=OFF ../marble-source ; \
 	make %{?_smp_mflags} ; \
+	ln -s src/lib/marble lib ; \
 	mkdir include ; cd include ; for i in `find ../../marble-source -name \*.h` ; do ln -s -f $i . ; done ; \
 	ln -s -f . marble )
-qmake-qt5 LIBDCDEVEL=./libdivecomputer LIBMARBLEDEVEL=./marble-build SPECIAL_MARBLE_PREFIX=1 subsurface.pro
-make %{?_smp_mflags}
+(mkdir subsurface-build ; cd subsurface-build ; \
+	cmake -DCMAKE_BUILD_TYPE=Release \
+		-DLIBDCDEVEL=$(pwd)/../libdivecomputer -DLIBDCSTATIC=1 \
+		-DLIBGIT2DEVEL=$(pwd)/../libgit2 -DLIBGIT2STATIC=1 \
+		-DLIBMARBLEDEVEL=$(pwd)/../marble-build \
+		-DLRELEASE=lrelease-qt5 \
+		-DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
+		$(pwd)/.. ; \
+	make VERBOSE=1 %{?_smp_mflags} subsurface)
 
 %install
 mkdir -p %{buildroot}/%{_libdir}
-make prefix=%{buildroot}/usr install
+(cd subsurface-build ; make VERBOSE=1 install )
 %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
 desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desktop
 %else
@@ -114,7 +125,6 @@ desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desk
 %{_datadir}/applications/subsurface.desktop
 %{_datadir}/icons/hicolor/*/apps/subsurface-icon.*
 %{_datadir}/subsurface/
-%{_mandir}/man1/subsurface.1%{?ext_man}
 /usr/lib*/libssrfmarblewidget.so*
 
 %changelog