From ec6cf0a6d6e9a7e88cde899893a9bdadc645e0df Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:51:07 +0000 Subject: [PATCH 1/9] Initialize branch F-10 for xlog --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 2813d5134f469b5ede0a2e83ed89012195d59491 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 23 Nov 2008 18:15:25 +0000 Subject: [PATCH 2/9] - drop mimecache.info from install target --- xlog.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xlog.spec b/xlog.spec index 2da37bf..332dec2 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 1.8.1 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -43,6 +43,7 @@ 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} @@ -73,13 +74,18 @@ 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 Nov 23 2008 Lucian Langa - 1.8.1-3 +- drop mimecache.info from install target + +* Sun Nov 23 2008 Lucian Langa - 1.8.1-2 +- fix for RH #472619: drop mimeinfo.cache + * Mon Sep 22 2008 Lucian Langa - 1.8.1-1 - new upstream versuion - change category to HamRadio From fcfb27c42d4f20c679fdf497f05bffa4e5631c7b Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 10 Dec 2008 14:24:50 +0000 Subject: [PATCH 3/9] - modify patch to correctly display documentation --- xlog-1.8.1-doc.patch | 49 +++++++++++++++++++++++++++++++++++++++----- xlog.spec | 5 ++++- 2 files changed, 48 insertions(+), 6 deletions(-) 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 332dec2..b653cb8 100644 --- a/xlog.spec +++ b/xlog.spec @@ -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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 10 2008 Lucian Langa - 1.8.1-4 +- modify patch to correctly display documentation + * Sun Nov 23 2008 Lucian Langa - 1.8.1-3 - drop mimecache.info from install target From 66ae6b1f7e4087fc3bb9142793dced4a4caf3d02 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 17 Feb 2009 08:37:32 +0000 Subject: [PATCH 4/9] - add --docdir option - remove m4 creation - drop patch0 (fixed upstream) - new upstream release --- .cvsignore | 2 +- sources | 2 +- xlog.spec | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3747a39..e2a1804 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xlog-1.8.1.tar.gz +xlog-2.0.tar.gz diff --git a/sources b/sources index ffb53b9..7520fef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df1b8bf7bc88cf8273936a13ace8bc0d xlog-1.8.1.tar.gz +7daf0a83be1728dbdbed3c1b3dac5310 xlog-2.0.tar.gz diff --git a/xlog.spec b/xlog.spec index b653cb8..fe234df 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,15 +1,13 @@ Name: xlog -Version: 1.8.1 -Release: 4%{?dist} +Version: 2.0 +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.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,17 +24,13 @@ 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/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 +%configure --enable-hamlib --docdir=%{_docdir}/%{name}-%{version} make %{?_smp_mflags} @@ -66,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 @@ -80,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 17 2009 Lucian Langa - 2.0-1 +- add --docdir option +- remove m4 creation +- drop patch0 (fixed upstream) +- new upstream release + * Wed Dec 10 2008 Lucian Langa - 1.8.1-4 - modify patch to correctly display documentation From 203ac286e9b1f5a634081318fb2a751c246da11c Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 25 Jun 2009 17:52:57 +0000 Subject: [PATCH 5/9] - new upstream release --- .cvsignore | 2 +- sources | 2 +- xlog.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index e2a1804..9e7326b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xlog-2.0.tar.gz +xlog-2.0.2.tar.gz diff --git a/sources b/sources index 7520fef..73fd3ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7daf0a83be1728dbdbed3c1b3dac5310 xlog-2.0.tar.gz +e33b03562cf8957029fe8cb9b98447cd xlog-2.0.2.tar.gz diff --git a/xlog.spec b/xlog.spec index fe234df..299e0d8 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,5 +1,5 @@ Name: xlog -Version: 2.0 +Version: 2.0.2 Release: 1%{?dist} Summary: Logging program for Hamradio Operators @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 25 2009 Lucian Langa - 2.0.2-1 +- new upstream release + * Tue Feb 17 2009 Lucian Langa - 2.0-1 - add --docdir option - remove m4 creation From f5e7e702a74ab0ee663a810bb5d5728e4f8b0d9c Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Mon, 20 Jul 2009 05:48:09 +0000 Subject: [PATCH 6/9] - new upstream release --- .cvsignore | 2 +- sources | 2 +- xlog.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9e7326b..3e3c21a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xlog-2.0.2.tar.gz +xlog-2.0.3.tar.gz diff --git a/sources b/sources index 73fd3ea..8f6029a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e33b03562cf8957029fe8cb9b98447cd xlog-2.0.2.tar.gz +c583ac96e3f1c3873f1030d44333e747 xlog-2.0.3.tar.gz diff --git a/xlog.spec b/xlog.spec index 299e0d8..edfa1a5 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,5 +1,5 @@ Name: xlog -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: Logging program for Hamradio Operators @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 20 2009 Lucian Langa - 2.0.3-1 +- new upstream release + * Thu Jun 25 2009 Lucian Langa - 2.0.2-1 - new upstream release From ccad2c1a9846a16ea95ce0a3ce709138be982f72 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 25 Oct 2009 19:09:07 +0000 Subject: [PATCH 7/9] fix desktop file #530845 --- xlog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xlog.spec b/xlog.spec index edfa1a5..45f7c8a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %setup -q #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 @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 25 2009 Lucian Langa - 2.0.3-2 +- fix desktop file #530845 + * Mon Jul 20 2009 Lucian Langa - 2.0.3-1 - new upstream release From c357017a0ac5dcdb223cf5e3b23a8859db97c65e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:02 +0000 Subject: [PATCH 8/9] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 83c7ec0..c672347 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From db4290899272366100c183f095d868086cf3c7db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:54:58 +0000 Subject: [PATCH 9/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c672347..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10