From 30854b29d6b34ecd2eb85f4a740a8ae133867adf Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 29 Nov 2006 22:50:18 +0000 Subject: [PATCH 01/15] Initialize branch FC-6 for urlgfe --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From ca928f72e8fd916f73cbf9a342e4625c0d9116e7 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 3 Aug 2007 11:21:54 +0000 Subject: [PATCH 02/15] - Fri Aug 3 28 packages (out of 39 packages I maintain) Well, now I got somewhat tired... --- urlgfe.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/urlgfe.spec b/urlgfe.spec index 200ecc1..f8c1d64 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,10 +1,10 @@ Name: urlgfe Version: 1.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Urlgfe download manager Group: Applications/Internet -License: LGPL +License: LGPLv2+ URL: http://urlget.sourceforge.net/ Source0: http://superb-west.dl.sourceforge.net/sourceforge/urlget/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,5 +61,8 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Fri Aug 3 2006 Mamoru Tasaka - 1.0-1.dist.1 +- License update + * Wed Nov 29 2006 Mamoru Tasaka - 1.0-1 - Initial packaging to import to Fedora Extras. From 522c87ada50916d233905dba576df4dddfa7faac Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 21 Aug 2007 18:45:57 +0000 Subject: [PATCH 03/15] Mass rebuild (17/26) --- urlgfe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index f8c1d64..59024f6 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe Version: 1.0 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 Summary: Urlgfe download manager Group: Applications/Internet @@ -61,6 +61,9 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 22 2006 Mamoru Tasaka - 1.0-1.dist.2 +- Mass rebuild (buildID or binutils issue) + * Fri Aug 3 2006 Mamoru Tasaka - 1.0-1.dist.1 - License update From d04cba4639ae5699e7b773c4b65d3f7d0fca1893 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 21 Aug 2007 18:48:06 +0000 Subject: [PATCH 04/15] Fix date --- urlgfe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index 59024f6..2885a5e 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -61,7 +61,7 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Wed Aug 22 2006 Mamoru Tasaka - 1.0-1.dist.2 +* Wed Aug 22 2007 Mamoru Tasaka - 1.0-1.dist.2 - Mass rebuild (buildID or binutils issue) * Fri Aug 3 2006 Mamoru Tasaka - 1.0-1.dist.1 From 1c9b12b57377ed217f571d6eb0a3f20ec0d45baf Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 21 Aug 2007 18:49:09 +0000 Subject: [PATCH 05/15] more fix... --- urlgfe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index 2885a5e..84bb5bb 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -64,7 +64,7 @@ done * Wed Aug 22 2007 Mamoru Tasaka - 1.0-1.dist.2 - Mass rebuild (buildID or binutils issue) -* Fri Aug 3 2006 Mamoru Tasaka - 1.0-1.dist.1 +* Fri Aug 3 2007 Mamoru Tasaka - 1.0-1.dist.1 - License update * Wed Nov 29 2006 Mamoru Tasaka - 1.0-1 From f83cbc327af641efee65e5e4208aa1ea0d51ae9b Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 29 Aug 2007 15:51:41 +0000 Subject: [PATCH 06/15] - 1.0.2 --- .cvsignore | 2 +- sources | 2 +- urlgfe.spec | 17 ++++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index eda5b24..0d82924 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -urlgfe-1.0.tar.gz +urlgfe-1.0.2.tar.gz diff --git a/sources b/sources index 01335f1..2345a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a5284665e09cac3397c3ea5d7baf6d8 urlgfe-1.0.tar.gz +d54bacbb107ae29a611dd3ec7bd597a2 urlgfe-1.0.2.tar.gz diff --git a/urlgfe.spec b/urlgfe.spec index 200ecc1..fcce804 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,16 +1,17 @@ Name: urlgfe -Version: 1.0 +Version: 1.0.2 Release: 1%{?dist} Summary: Urlgfe download manager Group: Applications/Internet -License: LGPL +License: LGPLv2+ URL: http://urlget.sourceforge.net/ -Source0: http://superb-west.dl.sourceforge.net/sourceforge/urlget/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel BuildRequires: expat-devel +BuildRequires: gawk BuildRequires: gtk2-devel BuildRequires: krb5-devel BuildRequires: pcre-devel @@ -29,6 +30,7 @@ each download in that category. %build %configure +%{__sed} -i.mkdir -e 's|@MKINSTALLDIRS@|install-sh -d|' po/Makefile %{__make} %{?_smp_mflags} %install @@ -61,5 +63,14 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 29 2007 Mamoru Tasaka - 1.0.2-1 +- 1.0.2 + +* Wed Aug 22 2007 Mamoru Tasaka - 1.0-1.dist.2 +- Mass rebuild (buildID or binutils issue) + +* Fri Aug 3 2007 Mamoru Tasaka - 1.0-1.dist.1 +- License update + * Wed Nov 29 2006 Mamoru Tasaka - 1.0-1 - Initial packaging to import to Fedora Extras. From 45d3f614840eb159f09a00d742f97a9b72f18392 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 29 Aug 2007 15:51:43 +0000 Subject: [PATCH 07/15] - 1.0.2 --- .cvsignore | 2 +- sources | 2 +- urlgfe.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index eda5b24..0d82924 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -urlgfe-1.0.tar.gz +urlgfe-1.0.2.tar.gz diff --git a/sources b/sources index 01335f1..2345a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a5284665e09cac3397c3ea5d7baf6d8 urlgfe-1.0.tar.gz +d54bacbb107ae29a611dd3ec7bd597a2 urlgfe-1.0.2.tar.gz diff --git a/urlgfe.spec b/urlgfe.spec index 84bb5bb..fcce804 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,16 +1,17 @@ Name: urlgfe -Version: 1.0 -Release: 1%{?dist}.2 +Version: 1.0.2 +Release: 1%{?dist} Summary: Urlgfe download manager Group: Applications/Internet License: LGPLv2+ URL: http://urlget.sourceforge.net/ -Source0: http://superb-west.dl.sourceforge.net/sourceforge/urlget/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel BuildRequires: expat-devel +BuildRequires: gawk BuildRequires: gtk2-devel BuildRequires: krb5-devel BuildRequires: pcre-devel @@ -29,6 +30,7 @@ each download in that category. %build %configure +%{__sed} -i.mkdir -e 's|@MKINSTALLDIRS@|install-sh -d|' po/Makefile %{__make} %{?_smp_mflags} %install @@ -61,6 +63,9 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Aug 29 2007 Mamoru Tasaka - 1.0.2-1 +- 1.0.2 + * Wed Aug 22 2007 Mamoru Tasaka - 1.0-1.dist.2 - Mass rebuild (buildID or binutils issue) From 3303fa5e4e6d7761928599ecfdf536b7c195e235 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 4 Dec 2007 17:28:06 +0000 Subject: [PATCH 08/15] Icon path fix for desktop-file-utils 0.14+ --- urlgfe.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index fcce804..2af8677 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Urlgfe download manager Group: Applications/Internet @@ -37,6 +37,8 @@ each download in that category. %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" +%{__sed} -i -e 's|%{name}-icon\.png|%{name}-icon|' \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install \ --delete-original \ --vendor fedora \ @@ -63,6 +65,9 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Dec 5 2007 Mamoru Tasaka - 1.0.2-2 +- Fix icon path in desktop file for desktop-file-utils 0.14+ + * Wed Aug 29 2007 Mamoru Tasaka - 1.0.2-1 - 1.0.2 From 529bd85237847ad31ec0e41098ee0e7fa8ae73ba Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 11 Feb 2008 17:33:32 +0000 Subject: [PATCH 09/15] - Rebuild against gcc43 --- urlgfe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index 2af8677..f84fa3a 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe Version: 1.0.2 -Release: 2%{?dist} +Release: 2%{?dist}.2 Summary: Urlgfe download manager Group: Applications/Internet @@ -65,6 +65,9 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Feb 12 2008 Mamoru Tasaka +- Rebuild against gcc43 + * Wed Dec 5 2007 Mamoru Tasaka - 1.0.2-2 - Fix icon path in desktop file for desktop-file-utils 0.14+ From 46ba6763ea8df50932b0596713511a9b1a7dc02f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 17 Dec 2008 09:37:05 +0000 Subject: [PATCH 10/15] - 1.0.3 --- .cvsignore | 2 +- sources | 2 +- urlgfe.spec | 31 ++++++++++++++++++++----------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d82924..e936252 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -urlgfe-1.0.2.tar.gz +urlgfe-1.0.3.tar.gz diff --git a/sources b/sources index 2345a6c..c59b57b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d54bacbb107ae29a611dd3ec7bd597a2 urlgfe-1.0.2.tar.gz +b620fd50bd9f03b6e0b04375c06371c5 urlgfe-1.0.3.tar.gz diff --git a/urlgfe.spec b/urlgfe.spec index f84fa3a..9a0e853 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe -Version: 1.0.2 -Release: 2%{?dist}.2 +Version: 1.0.3 +Release: 1%{?dist} Summary: Urlgfe download manager Group: Applications/Internet @@ -12,8 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: curl-devel BuildRequires: expat-devel BuildRequires: gawk +BuildRequires: gettext BuildRequires: gtk2-devel -BuildRequires: krb5-devel BuildRequires: pcre-devel BuildRequires: desktop-file-utils @@ -28,17 +28,23 @@ each download in that category. %prep %setup -q +for f in [A-Z]* ; do \ + %{__sed} -i.encoding -e 's|\r||g' $f +done + +%{__sed} -i -e 's|%{name}-icon\.png|%{name}-icon|' \ + %{name}.desktop + +( cd po/ ; rm -f stamp-po *.gmo ) + %build %configure -%{__sed} -i.mkdir -e 's|@MKINSTALLDIRS@|install-sh -d|' po/Makefile %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" -%{__sed} -i -e 's|%{name}-icon\.png|%{name}-icon|' \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install \ --delete-original \ --vendor fedora \ @@ -46,10 +52,6 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop -for f in [A-Z]* ; do \ - %{__sed} -i.encoding -e 's|\r||g' $f -done - %{find_lang} %{name} %clean @@ -57,7 +59,11 @@ done %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS +%doc AUTHORS +%doc COPYING +%doc COPYRIGHT +%doc ChangeLog +%doc NEWS %doc README %{_bindir}/%{name} @@ -65,6 +71,9 @@ done %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Dec 17 2008 Mamoru Tasaka - 1.0.3-1 +- 1.0.3 + * Tue Feb 12 2008 Mamoru Tasaka - Rebuild against gcc43 From 47bbbdbafb6791da3472153fda257ddb380085b3 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 24 Feb 2009 05:19:23 +0000 Subject: [PATCH 11/15] Mass rebuild --- urlgfe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index 9a0e853..bed4191 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Urlgfe download manager Group: Applications/Internet @@ -71,6 +71,9 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Feb 24 2009 Mamoru Tasaka - 1.0.3-2 +- F-11: Mass rebuild + * Wed Dec 17 2008 Mamoru Tasaka - 1.0.3-1 - 1.0.3 From 12cf9e008b3696d605826a60060003fbb7bbe0a8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 06:38:05 +0000 Subject: [PATCH 12/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- urlgfe.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urlgfe.spec b/urlgfe.spec index bed4191..d148179 100644 --- a/urlgfe.spec +++ b/urlgfe.spec @@ -1,6 +1,6 @@ Name: urlgfe Version: 1.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Urlgfe download manager Group: Applications/Internet @@ -71,6 +71,9 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Tue Feb 24 2009 Mamoru Tasaka - 1.0.3-2 - F-11: Mass rebuild From 35e535356a694cdcaf55e841593d8adc4ec3a6c2 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 27 Jul 2009 07:45:01 +0000 Subject: [PATCH 13/15] Forgot to take orphan package process... --- .cvsignore | 1 - Makefile | 21 ----------- dead.package | 3 ++ sources | 1 - urlgfe.spec | 99 ---------------------------------------------------- 5 files changed, 3 insertions(+), 122 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 urlgfe.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e936252..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -urlgfe-1.0.3.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 15a6db2..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: urlgfe -# $Id$ -NAME := urlgfe -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) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9c8de53 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2009-07-27 Mamoru Tasaka + +Renamed to uget, which has been in Fedora since 2009-05-04 diff --git a/sources b/sources deleted file mode 100644 index c59b57b..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -b620fd50bd9f03b6e0b04375c06371c5 urlgfe-1.0.3.tar.gz diff --git a/urlgfe.spec b/urlgfe.spec deleted file mode 100644 index d148179..0000000 --- a/urlgfe.spec +++ /dev/null @@ -1,99 +0,0 @@ -Name: urlgfe -Version: 1.0.3 -Release: 3%{?dist} -Summary: Urlgfe download manager - -Group: Applications/Internet -License: LGPLv2+ -URL: http://urlget.sourceforge.net/ -Source0: http://downloads.sourceforge.net/urlget/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: curl-devel -BuildRequires: expat-devel -BuildRequires: gawk -BuildRequires: gettext -BuildRequires: gtk2-devel -BuildRequires: pcre-devel -BuildRequires: desktop-file-utils - -%description -Urlgfe is a download manager that uses GTK+2 ,libcurl, and pcre. - -It allows you to classify URLs before downloading them, and -allows you to import URLs from HTML files. Every category has -an independent configuration that can be inherited by -each download in that category. - -%prep -%setup -q - -for f in [A-Z]* ; do \ - %{__sed} -i.encoding -e 's|\r||g' $f -done - -%{__sed} -i -e 's|%{name}-icon\.png|%{name}-icon|' \ - %{name}.desktop - -( cd po/ ; rm -f stamp-po *.gmo ) - -%build -%configure -%{__make} %{?_smp_mflags} - -%install -%{__rm} -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p" - -desktop-file-install \ - --delete-original \ - --vendor fedora \ - --remove-category Application \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop - -%{find_lang} %{name} - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS -%doc COPYING -%doc COPYRIGHT -%doc ChangeLog -%doc NEWS -%doc README - -%{_bindir}/%{name} -%{_datadir}/pixmaps/%{name}*.png -%{_datadir}/applications/fedora-%{name}.desktop - -%changelog -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Feb 24 2009 Mamoru Tasaka - 1.0.3-2 -- F-11: Mass rebuild - -* Wed Dec 17 2008 Mamoru Tasaka - 1.0.3-1 -- 1.0.3 - -* Tue Feb 12 2008 Mamoru Tasaka -- Rebuild against gcc43 - -* Wed Dec 5 2007 Mamoru Tasaka - 1.0.2-2 -- Fix icon path in desktop file for desktop-file-utils 0.14+ - -* Wed Aug 29 2007 Mamoru Tasaka - 1.0.2-1 -- 1.0.2 - -* Wed Aug 22 2007 Mamoru Tasaka - 1.0-1.dist.2 -- Mass rebuild (buildID or binutils issue) - -* Fri Aug 3 2007 Mamoru Tasaka - 1.0-1.dist.1 -- License update - -* Wed Nov 29 2006 Mamoru Tasaka - 1.0-1 -- Initial packaging to import to Fedora Extras. From a8404b12219504e36a7321902ba1b97f50a69199 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:03 +0000 Subject: [PATCH 14/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 15a6db2..e290d2a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: urlgfe -# $Id$ +# $Id: Makefile,v 1.1 2006/11/29 09:54:14 mtasaka Exp $ NAME := urlgfe 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 54aa6f8d773372a665a4810a595ca8ebce385452 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:47:13 +0000 Subject: [PATCH 15/15] 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 e290d2a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: urlgfe -# $Id: Makefile,v 1.1 2006/11/29 09:54:14 mtasaka Exp $ -NAME := urlgfe -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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6