rpms/xlog/F-8 xlog-1.8.1-doc.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xlog.spec, 1.2, 1.3 xlog-1.7-doc.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	.cvsignore sources xlog.spec 
Added Files:
	xlog-1.8.1-doc.patch 
Removed Files:
	xlog-1.7-doc.patch 
Log Message:
* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
- new upstream versuion
- change category to HamRadio

xlog-1.8.1-doc.patch:

--- NEW FILE xlog-1.8.1-doc.patch ---
--- 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
@@ -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 @@
 
 install-data-local:
 	@$(NORMAL_INSTALL)
-	$(INSTALL_DATA) AUTHORS $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) ChangeLog $(DESTDIR)$(pkgdatadir)
-	$(INSTALL_DATA) BUGS $(DESTDIR)$(pkgdatadir)
 
 rpm: Makefile
 	make dist
 	$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
 	rm $(PACKAGE)-$(VERSION).tar.gz
 
-ACLOCAL_AMFLAGS = -I m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 15:29:05 -0000	1.2
+++ .cvsignore	23 Sep 2008 05:27:03 -0000	1.3
@@ -1 +1 @@
-xlog-1.7.tar.gz
+xlog-1.8.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 15:29:05 -0000	1.2
+++ sources	23 Sep 2008 05:27:03 -0000	1.3
@@ -1 +1 @@
-f7d52236715f8ce30f251209dc3753d2  xlog-1.7.tar.gz
+df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/F-8/xlog.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xlog.spec	3 Aug 2008 15:42:38 -0000	1.2
+++ xlog.spec	23 Sep 2008 05:27:03 -0000	1.3
@@ -1,13 +1,13 @@
 Name:           xlog
-Version:        1.7
-Release:        2%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.7-doc.patch
+Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
@@ -17,7 +17,6 @@
 BuildRequires: gettext-devel
 BuildRequires: desktop-file-utils
 
-
 %description
 xlog is a logging program for amateur radio operators. The log is stored
 into a text file. QSO's are presented in a list. Items in the list can be
@@ -30,6 +29,7 @@
 %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
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
@@ -46,9 +46,8 @@
 
 %find_lang %{name}
 
-desktop-file-install --vendor fedora --delete-original  \
+desktop-file-install \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
-        --remove-category Application \
         $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop
 
 %post
@@ -68,7 +67,9 @@
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
+%{_datadir}/%{name}/maps
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome-mime-text-x-%{name}.png
 %{_datadir}/icons/%{name}-icon.png
@@ -79,6 +80,16 @@
 
 
 %changelog
+* Mon Sep 22 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-1
+- new upstream versuion
+- change category to HamRadio
+
+* Fri Aug 29 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.7-4
+- include /usr/share/xlog
+
+* Sat Aug 23 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-3
+- fix rh bug 458817
+
 * Wed Jul 16 2008 Lucian Langa <cooly at gnome.eu.org> - 1.7-2
 - Proper documentation packing
 - Misc cleanups


--- xlog-1.7-doc.patch DELETED ---