rpms/xlog/F-9 xlog-1.8.1-doc.patch,1.1,1.2 xlog.spec,1.5,1.6

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10035

Modified Files:
	xlog-1.8.1-doc.patch xlog.spec 
Log Message:
* Wed Dec 10 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-4
- modify patch to correctly display documentation

xlog-1.8.1-doc.patch:

Index: xlog-1.8.1-doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-9/xlog-1.8.1-doc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xlog-1.8.1-doc.patch	23 Sep 2008 05:27:17 -0000	1.1
+++ xlog-1.8.1-doc.patch	10 Dec 2008 13:29:37 -0000	1.2
@@ -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 = *~
+ 


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-9/xlog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xlog.spec	23 Nov 2008 18:13:15 -0000	1.5
+++ xlog.spec	10 Dec 2008 13:29:37 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           xlog
 Version:        1.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Wed Dec 10 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-4
+- modify patch to correctly display documentation
+
 * Sun Nov 23 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-3
 - drop mimecache.info from install target