[subsurface] Update to 3.9.2

Pierre-YvesChibon pingou at fedoraproject.org
Mon Dec 9 21:48:58 UTC 2013


commit 87a83b242480252aca8b854ba591a6702ddff8c0
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Mon Dec 9 22:48:54 2013 +0100

    Update to 3.9.2

 subsurface.spec |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)
---
diff --git a/subsurface.spec b/subsurface.spec
index 235d371..fdb3efb 100644
--- a/subsurface.spec
+++ b/subsurface.spec
@@ -5,9 +5,9 @@
 %global         libdc_version 0.4.1
 
 Name:           subsurface
-Version:        3.1.1
+Version:        3.9.2
 #Release:        1.{snapver}{?dist}
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        Rough divelog in C and Gtk
 
 License:        GPLv2
@@ -17,23 +17,25 @@ URL:            https://github.com/torvalds/subsurface
 # git clone https://github.com/torvalds/subsurface.git && cd subsurface
 # git archive --format=tar --prefix=subsurface-7fe652a/ 7fe652a | xz -z > subsurface-1.2-20120717git7fe652a.tar.xz
 #Source0:        subsurface-1.2-20120717git7fe652a.tar.xz
-Source0:        http://subsurface.hohndel.org/downloads/Subsurface-%{version}.tgz
+Source0:        http://subsurface.hohndel.org/downloads/subsurface-%{version}.tar.gz
 
 BuildRequires:  libdivecomputer-devel == %{libdc_version}
 BuildRequires:  libdivecomputer-static == %{libdc_version}
-BuildRequires:  libxml2-devel, gtk2-devel
-BuildRequires:  GConf2-devel, libxslt-devel
+BuildRequires:  qt-devel
+BuildRequires:  libudev-devel
+BuildRequires:  marble-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  libsqlite3x-devel
 BuildRequires:  libzip-devel
-BuildRequires:  sqlite-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  gettext
-BuildRequires:  osm-gps-map-devel
+BuildRequires:  asciidoc
 
 # Since we build against the static libdivecomputer
 # I want to have a hard constraint on the version compiled against
 # I'll update both when needed.
 Requires:       libdivecomputer == %{libdc_version}
-Requires:       osm-gps-map
+Requires:       marble
 
 %description
 Subsurface is an open source dive log program.
@@ -44,13 +46,14 @@ all the dive computer supported by libdivecomputer.
 
 
 %prep
-%setup -q -n Subsurface-%{version}
+%setup -q -n subsurface-%{version}
 
 %build
+qmake-qt4
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT/%{_prefix}
 
 desktop-file-install                                    \
 --delete-original                                       \
@@ -59,7 +62,7 @@ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
 chmod -x $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/subsurface-icon.svg
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -74,9 +77,11 @@ fi
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
 %doc README Documentation
 %{_bindir}/subsurface
+%{_docdir}/subsurface
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}-icon.svg
 %{_datadir}/%{name}/
@@ -84,6 +89,9 @@ fi
 
 
 %changelog
+* Mon Dec 09 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 3.9.2-1
+- Update to 3.9.2 which is the second beta release before 0.4.0
+
 * Wed Aug 07 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 3.1.1-3
 - Rebuild to fix broken dependency
 


More information about the scm-commits mailing list