dist-git conversion

#2781)

.gitignore

@@ -0,0 +1 @@
+xlog-1.8.1.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

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

xlog-1.8.1-doc.patch

@@ -0,0 +1,60 @@
+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
+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)
+-	$(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
+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

@@ -0,0 +1,139 @@
+Name:           xlog
+Version:        1.8.1
+Release:        4%{?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
+BuildRequires: shared-mime-info
+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
+added, deleted or updated. For each contact, dxcc information is displayed
+and bearings and distance is calculated, both short and long path.
+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/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+
+%build
+#missing directory from package
+mkdir m4
+autoreconf -i -f
+%configure --enable-hamlib
+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}
+
+desktop-file-install \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop
+
+%post
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+
+
+
+%clean
+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
+%{_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
+%{_datadir}/applications/*.desktop
+%{_datadir}/mime/packages/*
+%{_mandir}/man?/*
+
+
+%changelog
+* 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
+
+* Fri Aug 29 2008 Michael Schwendt <mschwendt@fedoraproject.org> - 1.7-4
+- include /usr/share/xlog
+
+* Sat Aug 23 2008 Lucian Langa <cooly@gnome.eu.org> - 1.7-3
+- fix rh bug 458817
+
+* Wed Jul 16 2008 Lucian Langa <cooly@gnome.eu.org> - 1.7-2
+- Proper documentation packing
+- Misc cleanups
+
+* Thu Feb 28 2008 Robert 'Bob' Jensen 1.7-1
+- Upstream Version bump
+- Submit for review
+
+* Mon Dec 10 2007 Robert 'Bob' Jensen 1.6.2-2
+- SPEC file clean up
+
+* Mon Dec 10 2007 Robert 'Bob' Jensen 1.6.2-1
+- Upstream Version bump
+
+* Thu Nov 28 2007 Robert 'Bob' Jensen 1.6.1-2
+- License update
+
+* Thu Nov 28 2007 Robert 'Bob' Jensen 1.6.1-1
+- Upstream Version bump to solve License issue in wwl.c
+
+* Thu Nov 22 2007 Sindre Pedersen Bjørdal <foolish@guezz.net> 1.6-3
+- Fix mimeinfo scriptlet
+- Add desktop-file-utils shebang
+- Fix .desktop file
+- Update files list
+- Update license
+- Add gettext and shared-mime-info BRs
+
+* Thu Nov 22 2007 Robert 'Bob' Jensen 1.6-2
+- Fix BRs
+
+* Mon Nov 19 2007 Robert 'Bob' Jensen 1.6-1
+- Current xlog 1.6 requires gtk+-2.0 >= 2.12.0
+- Build xlog 1.5 for F7
+
+* Mon Nov 19 2007 Robert 'Bob' Jensen 1.3.1-1
+- Initial Fedora spec
+- use Joop's spec from version 1.3.1 as a base