diff --git a/xlog-1.8.1-doc.patch b/xlog-1.8.1-doc.patch index fd0e9d1..a1d9c2f 100644 --- a/xlog-1.8.1-doc.patch +++ b/xlog-1.8.1-doc.patch @@ -1,11 +1,13 @@ ---- xlog-1.8.1/data/Makefile.am 2007-03-29 18:29:40.000000000 +0300 -+++ xlog-1.8.1-mod/data/Makefile.am 2008-07-17 16:15:39.000000000 +0300 +diff -Naur xlog-1.8.1/data/Makefile.am xlog-1.8.1-mod/data/Makefile.am +--- xlog-1.8.1/data/Makefile.am 2008-04-04 23:08:35.000000000 +0300 ++++ xlog-1.8.1-mod/data/Makefile.am 2008-12-10 12:24:39.000000000 +0200 @@ -1 +1 @@ -SUBDIRS = desktop doc dxcc glabels images man maps mime pixmaps remote utils +SUBDIRS = desktop dxcc images man maps mime pixmaps remote utils ---- xlog-1.8.1/Makefile.am 2007-12-08 15:28:59.000000000 +0200 -+++ xlog-1.8.1-mod/Makefile.am 2008-07-17 16:22:59.000000000 +0300 -@@ -11,13 +11,9 @@ +diff -Naur xlog-1.8.1/Makefile.am xlog-1.8.1-mod/Makefile.am +--- xlog-1.8.1/Makefile.am 2008-08-28 17:35:49.000000000 +0300 ++++ xlog-1.8.1-mod/Makefile.am 2008-12-10 12:24:39.000000000 +0200 +@@ -8,13 +8,9 @@ install-data-local: @$(NORMAL_INSTALL) @@ -19,3 +21,40 @@ rm $(PACKAGE)-$(VERSION).tar.gz -ACLOCAL_AMFLAGS = -I m4 +diff -Naur xlog-1.8.1/src/gui_helpdialog.c xlog-1.8.1-mod/src/gui_helpdialog.c +--- xlog-1.8.1/src/gui_helpdialog.c 2008-08-28 11:40:01.000000000 +0300 ++++ xlog-1.8.1-mod/src/gui_helpdialog.c 2008-12-10 15:00:33.000000000 +0200 +@@ -79,7 +79,7 @@ + #ifdef G_OS_WIN32 + helpfile = g_strdup_printf ("%s", filename); + #else +- helpfile = g_strdup_printf ("%s%s%s", XLOG_DATADIR, G_DIR_SEPARATOR_S, ++ helpfile = g_strdup_printf ("%s%s%s", XLOG_DOCDIR, G_DIR_SEPARATOR_S, + filename); + #endif + gtk_text_buffer_create_tag (buffer, "bold", "weight", PANGO_WEIGHT_BOLD, NULL); +diff -Naur xlog-1.8.1/src/gui_keys.c xlog-1.8.1-mod/src/gui_keys.c +--- xlog-1.8.1/src/gui_keys.c 2008-08-28 10:27:09.000000000 +0300 ++++ xlog-1.8.1-mod/src/gui_keys.c 2008-12-10 15:00:44.000000000 +0200 +@@ -87,7 +87,7 @@ + #ifdef G_OS_WIN32 + helpfile = g_strdup_printf ("%s", filename); + #else +- helpfile = g_strdup_printf ("%s%s%s", XLOG_DATADIR, G_DIR_SEPARATOR_S, ++ helpfile = g_strdup_printf ("%s%s%s", XLOG_DOCDIR, G_DIR_SEPARATOR_S, + filename); + #endif + buf = g_new0 (gchar, 100); +diff -Naur xlog-1.8.1/src/Makefile.am xlog-1.8.1-mod/src/Makefile.am +--- xlog-1.8.1/src/Makefile.am 2008-05-15 17:54:16.000000000 +0300 ++++ xlog-1.8.1-mod/src/Makefile.am 2008-12-10 12:25:02.000000000 +0200 +@@ -11,7 +11,8 @@ + -DGTK_DISABLE_DEPRECATED \ + -DDATADIR=\""$(datadir)"\" \ + -DXLOG_LOCALEDIR=\""$(datadir)/locale"\" \ +- -DXLOG_DATADIR=\""$(datadir)/xlog"\" ++ -DXLOG_DATADIR=\""$(datadir)/xlog"\" \ ++ -DXLOG_DOCDIR=\""$(DOCDIR)"\" + + CLEANFILES = *~ + diff --git a/xlog.spec b/xlog.spec index b04a26e..44615d8 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 1.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %prep %setup -q -%patch0 -p1 -b doc +%patch0 -p1 -b .doc #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/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop @@ -37,7 +37,7 @@ sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.deskto mkdir m4 autoreconf -i -f %configure --enable-hamlib -make %{?_smp_mflags} +make %{?_smp_mflags} -e DOCDIR='%{_docdir}/%{name}-%{version}' %install @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 10 2008 Lucian Langa - 1.8.1-3 +- modify patch to correctly display documentation + * Sun Nov 23 2008 Lucian Langa - 1.8.1-2 - fix for RH #472619: drop mimeinfo.cache