From 5312a418b5605abeeda6745b644a335c6f944517 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 3 Aug 2008 04:05:05 +0000 Subject: [PATCH 1/9] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 2a3cffacde12f11bb6f535ed606ff709faab716a Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 3 Aug 2008 15:29:05 +0000 Subject: [PATCH 2/9] initial import --- .cvsignore | 1 + sources | 1 + xlog-1.7-doc.patch | 21 ++++++++ xlog.spec | 117 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 xlog-1.7-doc.patch create mode 100644 xlog.spec diff --git a/.cvsignore b/.cvsignore index e69de29..fd5f4a4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xlog-1.7.tar.gz diff --git a/sources b/sources index e69de29..c5b1d3c 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f7d52236715f8ce30f251209dc3753d2 xlog-1.7.tar.gz diff --git a/xlog-1.7-doc.patch b/xlog-1.7-doc.patch new file mode 100644 index 0000000..56e5be4 --- /dev/null +++ b/xlog-1.7-doc.patch @@ -0,0 +1,21 @@ +--- xlog-1.7/data/Makefile.am 2007-03-29 18:29:40.000000000 +0300 ++++ xlog-1.7-mod/data/Makefile.am 2008-07-17 16:15:39.000000000 +0300 +@@ -1 +1 @@ +-SUBDIRS = desktop doc dxcc glabels images man mime pixmaps remote utils ++SUBDIRS = desktop dxcc images man mime pixmaps remote utils +--- xlog-1.7/Makefile.am 2007-12-08 15:28:59.000000000 +0200 ++++ xlog-1.7-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 diff --git a/xlog.spec b/xlog.spec new file mode 100644 index 0000000..32ef63c --- /dev/null +++ b/xlog.spec @@ -0,0 +1,117 @@ +Name: xlog +Version: 1.7 +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.7-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 + +%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/.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" + +%find_lang %{name} + +desktop-file-install --vendor fedora --delete-original \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --remove-category Application \ + $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} +%{_datadir}/%{name}/dxcc +%{_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 +* Wed Jul 16 2008 Lucian Langa - 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 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 From 22aa8ffce927bd5efbcc2c3e018d9f458db8d013 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 3 Aug 2008 15:42:38 +0000 Subject: [PATCH 3/9] add missing requirements --- xlog.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xlog.spec b/xlog.spec index 32ef63c..6aa1009 100644 --- a/xlog.spec +++ b/xlog.spec @@ -15,6 +15,8 @@ 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 From d534f69ce8fb7612fb95e859bfb9232cb471dee9 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 23 Sep 2008 05:27:03 +0000 Subject: [PATCH 4/9] - new upstream versuion - change category to HamRadio --- .cvsignore | 2 +- sources | 2 +- xlog-1.7-doc.patch | 21 --------------------- xlog-1.8.1-doc.patch | 21 +++++++++++++++++++++ xlog.spec | 23 +++++++++++++++++------ 5 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 xlog-1.7-doc.patch create mode 100644 xlog-1.8.1-doc.patch diff --git a/.cvsignore b/.cvsignore index fd5f4a4..3747a39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xlog-1.7.tar.gz +xlog-1.8.1.tar.gz diff --git a/sources b/sources index c5b1d3c..ffb53b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7d52236715f8ce30f251209dc3753d2 xlog-1.7.tar.gz +df1b8bf7bc88cf8273936a13ace8bc0d xlog-1.8.1.tar.gz diff --git a/xlog-1.7-doc.patch b/xlog-1.7-doc.patch deleted file mode 100644 index 56e5be4..0000000 --- a/xlog-1.7-doc.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xlog-1.7/data/Makefile.am 2007-03-29 18:29:40.000000000 +0300 -+++ xlog-1.7-mod/data/Makefile.am 2008-07-17 16:15:39.000000000 +0300 -@@ -1 +1 @@ --SUBDIRS = desktop doc dxcc glabels images man mime pixmaps remote utils -+SUBDIRS = desktop dxcc images man mime pixmaps remote utils ---- xlog-1.7/Makefile.am 2007-12-08 15:28:59.000000000 +0200 -+++ xlog-1.7-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 diff --git a/xlog-1.8.1-doc.patch b/xlog-1.8.1-doc.patch new file mode 100644 index 0000000..fd0e9d1 --- /dev/null +++ b/xlog-1.8.1-doc.patch @@ -0,0 +1,21 @@ +--- 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 diff --git a/xlog.spec b/xlog.spec index 6aa1009..2da37bf 100644 --- a/xlog.spec +++ b/xlog.spec @@ -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: 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 @@ -30,6 +29,7 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %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 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 22 2008 Lucian Langa - 1.8.1-1 +- new upstream versuion +- change category to HamRadio + +* Fri Aug 29 2008 Michael Schwendt - 1.7-4 +- include /usr/share/xlog + +* Sat Aug 23 2008 Lucian Langa - 1.7-3 +- fix rh bug 458817 + * Wed Jul 16 2008 Lucian Langa - 1.7-2 - Proper documentation packing - Misc cleanups From 94e7ed13f744b55597ac19c96e17d0499f90ab57 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 23 Nov 2008 16:53:11 +0000 Subject: [PATCH 5/9] - fix for RH #472619: drop mimeinfo.cache --- xlog.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xlog.spec b/xlog.spec index 2da37bf..05c8679 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 1.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -73,13 +73,15 @@ 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-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 6005b0394a004146a9004c14d3374439c2912fe6 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 23 Nov 2008 17:07:37 +0000 Subject: [PATCH 6/9] - drop mimecache.info from install target --- xlog.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 05c8679..332dec2 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 1.8.1 -Release: 2%{?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} @@ -79,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %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 From b564ed703f1390df57a58b735276d31f50ef43eb Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 10 Dec 2008 13:19:44 +0000 Subject: [PATCH 7/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 2bf0fd1695f07474ccdb77485350203b8c55f451 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:04 +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 13528ae3777100b7b311f8924a70e9b3847a97f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:54:55 +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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8