The package rpms/viking.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/viking.git/commit/?id=c0802baddb6....
Change:
+ExcludeArch: s390 s390x
Thanks.
Full change:
============
commit c0802baddb69388c684b4ac1e9589071d94d6341
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 14:42:20 2019 +0100
Exclude s390 s390x
diff --git a/viking.spec b/viking.spec
index 672c2ee..c8f21c4 100644
--- a/viking.spec
+++ b/viking.spec
@@ -7,6 +7,7 @@ License: GPLv2+
URL:
http://viking.sourceforge.net/
Source0:
http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2
#Patch0: path-to-manpages-docbook-xsl.patch
+ExcludeArch: s390 s390x
BuildRequires: gcc-c++
BuildRequires: intltool
commit 70afa59d51e6f69fe02da59630bdea5d1e7041c8
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 14:21:15 2019 +0100
Update compiler BR
diff --git a/viking.spec b/viking.spec
index 8badd03..672c2ee 100644
--- a/viking.spec
+++ b/viking.spec
@@ -8,7 +8,7 @@ URL:
http://viking.sourceforge.net/
Source0:
http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2
#Patch0: path-to-manpages-docbook-xsl.patch
-BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: expat-devel
BuildRequires: gdk-pixbuf2-devel
commit f69e8b2d8ecfcc8a4dbfba9973344f8dd822c2ab
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 14:08:50 2019 +0100
Add nettle-devel as BR
diff --git a/viking.spec b/viking.spec
index cd8005d..8badd03 100644
--- a/viking.spec
+++ b/viking.spec
@@ -28,6 +28,7 @@ BuildRequires: mapnik-devel
BuildRequires: rarian-compat
BuildRequires: geoclue2-devel
BuildRequires: liboauth-devel
+BuildRequires: nettle-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
commit c044eb461326fb4b1ac39e43a731fe8d8df75fa9
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 14:01:58 2019 +0100
Add liboauth-devel as BR
diff --git a/viking.spec b/viking.spec
index 6bbbc9b..cd8005d 100644
--- a/viking.spec
+++ b/viking.spec
@@ -27,6 +27,8 @@ BuildRequires: docbook-style-xsl
BuildRequires: mapnik-devel
BuildRequires: rarian-compat
BuildRequires: geoclue2-devel
+BuildRequires: liboauth-devel
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
commit cf191c6541d98aeb6a8cf950986b9693a8c8bb58
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 13:55:35 2019 +0100
Add new BR
diff --git a/viking.spec b/viking.spec
index a44315e..6bbbc9b 100644
--- a/viking.spec
+++ b/viking.spec
@@ -26,7 +26,7 @@ BuildRequires: docbook-utils
BuildRequires: docbook-style-xsl
BuildRequires: mapnik-devel
BuildRequires: rarian-compat
-
+BuildRequires: geoclue2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
commit 86eccbfd5da9d828e477569491a5465874973a43
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 13:45:16 2019 +0100
Disable patch for a test
diff --git a/viking.spec b/viking.spec
index 4fe3fe5..a44315e 100644
--- a/viking.spec
+++ b/viking.spec
@@ -6,7 +6,7 @@ Summary: GPS data editor and analyzer
License: GPLv2+
URL:
http://viking.sourceforge.net/
Source0:
http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2
-Patch0: path-to-manpages-docbook-xsl.patch
+#Patch0: path-to-manpages-docbook-xsl.patch
BuildRequires: gcc
BuildRequires: intltool
commit a54f42857b5f6c95656fa6b068a3254b12583305
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 13:38:58 2019 +0100
Fix year
diff --git a/viking.spec b/viking.spec
index 8c9c57c..4fe3fe5 100644
--- a/viking.spec
+++ b/viking.spec
@@ -90,7 +90,7 @@ fi
%{_mandir}/man1/%{name}.1*
%changelog
-* Tue Jan 22 2018 Fabian Affolter <mail(a)fabian-affolter.ch> - 1.7-1
+* Tue Jan 22 2019 Fabian Affolter <mail(a)fabian-affolter.ch> - 1.7-1
- Update to new upstream version 1.7
* Fri Sep 28 2018 Federico Bruni <fede(a)inventati.org> - 1.6.2-8
commit 930d218157bc59009eaf61ebdc47ed783799c17d
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Tue Jan 22 13:38:08 2019 +0100
* Tue Jan 22 2018 Fabian Affolter <mail(a)fabian-affolter.ch> - 1.7-1
- Update to new upstream version 1.7
diff --git a/.gitignore b/.gitignore
index beef472..fde820c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ viking-0.9.94.tar.gz
/viking-1.6.tar.bz2
/viking-1.6.1.tar.bz2
/viking-1.6.2.tar.bz2
+/viking-1.7.tar.bz2
diff --git a/sources b/sources
index a272d8d..7606c46 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-288cf8c6043ff4d04523595457fd5ed0 viking-1.6.2.tar.bz2
+SHA512 (viking-1.7.tar.bz2) =
ff26cd808b407af5cb7c3cebed4c550e0c28ac1871497c2cedd09f7e1e72bd24ef0048e6e5d587aa9b03cb1860c3d3afcbe62308ade2179dea4b5f9668d05600
diff --git a/viking.spec b/viking.spec
index e1df85c..8c9c57c 100644
--- a/viking.spec
+++ b/viking.spec
@@ -1,6 +1,6 @@
Name: viking
-Version: 1.6.2
-Release: 8%{?dist}
+Version: 1.7
+Release: 1%{?dist}
Summary: GPS data editor and analyzer
License: GPLv2+
@@ -90,6 +90,9 @@ fi
%{_mandir}/man1/%{name}.1*
%changelog
+* Tue Jan 22 2018 Fabian Affolter <mail(a)fabian-affolter.ch> - 1.7-1
+- Update to new upstream version 1.7
+
* Fri Sep 28 2018 Federico Bruni <fede(a)inventati.org> - 1.6.2-8
- Add man page and fix help files location (rhbz#1633836)
commit 727e27368c9847474d7d539223b202b0ef030318
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Sun Dec 2 22:15:02 2018 +0100
Remove period
diff --git a/viking.spec b/viking.spec
index 0a5ba12..e1df85c 100644
--- a/viking.spec
+++ b/viking.spec
@@ -91,7 +91,7 @@ fi
%changelog
* Fri Sep 28 2018 Federico Bruni <fede(a)inventati.org> - 1.6.2-8
-- Add man page and fix help files location (rhbz#1633836).
+- Add man page and fix help files location (rhbz#1633836)
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.2-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 7cd6d9aa40d00b5ce5149c34697f6aa43ba554ad
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Sun Dec 2 22:12:54 2018 +0100
Add patch
diff --git a/path-to-manpages-docbook-xsl.patch b/path-to-manpages-docbook-xsl.patch
new file mode 100644
index 0000000..bd86f4a
--- /dev/null
+++ b/path-to-manpages-docbook-xsl.patch
@@ -0,0 +1,26 @@
+From e34d60083a5eb5a918ac0a03c76062348f4292f1 Mon Sep 17 00:00:00 2001
+From: Federico Bruni <fede(a)inventati.org>
+Date: Tue, 2 Oct 2018 05:56:15 +0200
+Subject: [PATCH] use Fedora path to manpages/docbook.xsl
+
+otherwise man and help pages won't be built.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 370ba78e..ace03de0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -553,7 +553,7 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE,
${VIK_CONFIG_DEFAULT_TILE_AGE},
+ AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code])
+
+ dnl man pages processing
+-DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
++DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl
+ AC_SUBST(DB2MAN_XSL)
+ AC_PATH_PROG(XP,xsltproc)
+ AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"])
+--
+2.17.1
+
commit c9d11cf435c69e38a7a749a2ad79ef6e4b992729
Author: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Sun Dec 2 22:12:09 2018 +0100
* Fri Sep 28 2018 Federico Bruni <fede(a)inventati.org> - 1.6.2-8
- Add man page and fix help files location (rhbz#1633836)
diff --git a/viking.spec b/viking.spec
index 1ecab37..0a5ba12 100644
--- a/viking.spec
+++ b/viking.spec
@@ -1,18 +1,19 @@
Name: viking
Version: 1.6.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: GPS data editor and analyzer
License: GPLv2+
URL:
http://viking.sourceforge.net/
Source0:
http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2
+Patch0: path-to-manpages-docbook-xsl.patch
BuildRequires: gcc
BuildRequires: intltool
BuildRequires: expat-devel
BuildRequires: gdk-pixbuf2-devel
BuildRequires: gpsd-devel
-BuildRequires: gtk2-devel
+BuildRequires: gtk2-devel
BuildRequires: libcurl-devel
BuildRequires: gtk-doc
BuildRequires: gnome-doc-utils
@@ -21,6 +22,10 @@ BuildRequires: bzip2-devel
BuildRequires: file-devel
BuildRequires: libgexiv2-devel
BuildRequires: sqlite-devel
+BuildRequires: docbook-utils
+BuildRequires: docbook-style-xsl
+BuildRequires: mapnik-devel
+BuildRequires: rarian-compat
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -33,10 +38,10 @@ Requires: expect
Viking is a free/open source program to manage GPS data. You can import
and plot tracks and waypoints, show OpenStreetMap and/or Terraserver maps
under it, download geocaches for an area on the map, make new tracks and
-waypoints, see real-time GPS position, etc.
+waypoints, see real-time GPS position, etc.
%prep
-%setup -q
+%autosetup
# Convert to utf-8
for file in ChangeLog NEWS TODO; do
mv $file timestamp
@@ -45,10 +50,8 @@ for file in ChangeLog NEWS TODO; do
done
%build
-%configure \
- --disable-scrollkeeper \
- --disable-mapnik
- # Failing for 1.6.1
+%configure
+ # Failing for 1.6.1
#--enable-gtk-doc
make %{?_smp_mflags}
@@ -60,7 +63,7 @@ desktop-file-install \
--delete-original \
--dir=%{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+%find_lang %{name} --with-gnome
%check
make test
@@ -84,8 +87,12 @@ fi
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
%changelog
+* Fri Sep 28 2018 Federico Bruni <fede(a)inventati.org> - 1.6.2-8
+- Add man page and fix help files location (rhbz#1633836).
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.6.2-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild