diff --git a/.gitignore b/.gitignore index fa1f72c..40359d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xlog-2.0.3.tar.gz /xlog-2.0.5.tar.gz /xlog-2.0.6.tar.gz /xlog-2.0.11.tar.gz +/xlog-2.0.13.tar.gz diff --git a/sources b/sources index 961cc4c..7e4e39b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23af1268cd385c7747f5f5de6095a22f xlog-2.0.11.tar.gz +ddbffe1065918b43b32996fd4ba165f7 xlog-2.0.13.tar.gz diff --git a/xlog-2.0.13-no-error.patch b/xlog-2.0.13-no-error.patch new file mode 100644 index 0000000..b91d859 --- /dev/null +++ b/xlog-2.0.13-no-error.patch @@ -0,0 +1,15 @@ +--- xlog-2.0.13-mod/configure.ac 2015-04-21 22:37:12.000000000 +0200 ++++ xlog-2.0.13/configure.ac 2016-02-16 12:06:50.684089981 +0100 +@@ -16,9 +16,9 @@ + AC_FUNC_STRPTIME + AC_CHECK_FUNCS(strchr index) + +-if test "${ac_cv_c_compiler_gnu}" = "yes"; then +- CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror" +-fi ++dnl if test "${ac_cv_c_compiler_gnu}" = "yes"; then ++dnl CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror" ++dnl fi + + PKG_CHECK_MODULES(GLIB, glib-2.0) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0) diff --git a/xlog.spec b/xlog.spec index b0736c4..c920ff9 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,14 +1,16 @@ Name: xlog -Version: 2.0.11 -Release: 6%{?dist} +Version: 2.0.13 +Release: 1%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications License: GPLv3 URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-2.0.13-no-error.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gtk2-devel -BuildRequires: libgnomeprint22-devel BuildRequires: hamlib-devel BuildRequires: shared-mime-info BuildRequires: gettext-devel @@ -23,13 +25,14 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %prep %setup -q +%patch0 -p1 -b .no-error #fix bogus .desktop file -sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop %build -%configure --enable-hamlib --docdir=%{_docdir}/%{name} +autoreconf -vif +%configure CFLAGS="%{optflags} -lm" --enable-hamlib --docdir=%{_docdir}/%{name} make %{?_smp_mflags} @@ -62,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/glabels/qsllabels.glabels +%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/KEYS data/glabels %{_bindir}/%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/dxcc @@ -76,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 15 2016 Lucian Langa - 2.0.13-1 +- cadd patch to deactivate Werror +- doc files packaging fixes +- drop gnomeprint BR +- update to latest upstream + * Fri Feb 05 2016 Fedora Release Engineering - 2.0.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild