dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xlog-1.8.1.tar.gz

.gitignore

@@ -0,0 +1 @@
+xlog-2.0.3.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xlog
-# $Id$
-NAME := xlog
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz
+c583ac96e3f1c3873f1030d44333e747  xlog-2.0.3.tar.gz

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 = *~
+ 

xlog.spec

@@ -1,15 +1,13 @@
 Name:           xlog
-Version:        1.8.1
-Release:        1%{?dist}
+Version:        2.0.3
+Release:        2%{?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.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
 BuildRequires: libgnomeprint22-devel
 BuildRequires: hamlib-devel
@@ -26,23 +24,20 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files.
 
 %prep
 %setup -q
-%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/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
-#missing directory from package
-mkdir m4
-autoreconf -i -f
-%configure --enable-hamlib
+%configure --enable-hamlib --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
 
 %find_lang %{name}
 
@@ -65,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
+%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
@@ -73,13 +68,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 %{_datadir}/icons/gnome-mime-text-x-%{name}.png
 %{_datadir}/icons/%{name}-icon.png
-%{_datadir}/applications/mimeinfo.cache
 %{_datadir}/applications/*.desktop
 %{_datadir}/mime/packages/*
 %{_mandir}/man?/*
 
 
 %changelog
+* Sun Oct 25 2009 Lucian Langa <cooly@gnome.eu.org> - 2.0.3-2
+- fix desktop file #530845
+
+* Mon Jul 20 2009 Lucian Langa <cooly@gnome.eu.org> - 2.0.3-1
+- new upstream release
+
+* Thu Jun 25 2009 Lucian Langa <cooly@gnome.eu.org> - 2.0.2-1
+- new upstream release
+
+* Tue Feb 17 2009 Lucian Langa <cooly@gnome.eu.org> - 2.0-1
+- add --docdir option
+- remove m4 creation
+- drop patch0 (fixed upstream)
+- new upstream release
+
+* Wed Dec 10 2008 Lucian Langa <cooly@gnome.eu.org> - 1.8.1-4
+- modify patch to correctly display documentation
+
+* Sun Nov 23 2008 Lucian Langa <cooly@gnome.eu.org> - 1.8.1-3
+- drop mimecache.info from install target
+
+* Sun Nov 23 2008 Lucian Langa <cooly@gnome.eu.org> - 1.8.1-2
+- fix for RH #472619: drop mimeinfo.cache
+
 * Mon Sep 22 2008 Lucian Langa <cooly@gnome.eu.org> - 1.8.1-1
 - new upstream versuion
 - change category to HamRadio