From 9d20e8b9a35d8b1f4430dac9ded23f9edd08c1b4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:41:33 +0000 Subject: [PATCH 01/12] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 010b1b4..0900450 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: desktop-file-utils -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 04:07:09 cvsdist Exp $ NAME := desktop-file-utils SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +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),) +# attempt 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) From 26a01a3905b325107c3bec7cb0160cfcd12e5906 Mon Sep 17 00:00:00 2001 From: xulchris Date: Fri, 30 Nov 2007 19:36:29 +0000 Subject: [PATCH 02/12] upstream sync --- .cvsignore | 2 +- desktop-file-utils.spec | 10 ++++++---- short-option.patch | 24 ------------------------ sources | 2 +- 4 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 short-option.patch diff --git a/.cvsignore b/.cvsignore index ebb6686..0c6df40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -desktop-file-utils-0.13.tar.gz +desktop-file-utils-0.14.tar.gz diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 5b0278f..7e87876 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,11 +1,10 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.13 -Release: 3%{?dist} +Version: 0.14 +Release: 1%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 -Patch0: short-option.patch License: GPLv2+ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,7 +24,6 @@ fixing it up in the process. %prep %setup -q -%patch0 -p1 -b .short-option %build %configure @@ -45,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* Fri Nov 30 2007 Christopher Stone 0.14-1 +- Upstream sync +- Remove no longer needed short option patch + * Wed Aug 15 2007 Matthias Clasen - 0.13-3 - Make the -m option work (#232761) diff --git a/short-option.patch b/short-option.patch deleted file mode 100644 index 54a0721..0000000 --- a/short-option.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up desktop-file-utils-0.13/src/install.c.short-option desktop-file-utils-0.13/src/install.c ---- desktop-file-utils-0.13/src/install.c.short-option 2007-08-15 21:14:57.000000000 -0400 -+++ desktop-file-utils-0.13/src/install.c 2007-08-15 21:17:06.000000000 -0400 -@@ -430,7 +430,9 @@ parse_options_callback (const gchar *op - GError **error) - { - /* skip "--" */ -- option_name += 2; -+ option_name++; -+ if (*option_name == '-') -+ option_name++; - - if (strcmp (OPTION_VENDOR, option_name) == 0) - { -@@ -480,7 +482,8 @@ parse_options_callback (const gchar *op - g_strdup (value)); - } - -- else if (strcmp (OPTION_MODE, option_name) == 0) -+ else if (strcmp (OPTION_MODE, option_name) == 0 || -+ strcmp ("m", option_name) == 0) - { - unsigned long ul; - char *end; diff --git a/sources b/sources index c5ba7af..4a85355 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2ee84d0de753d4052011714c20d6efae desktop-file-utils-0.13.tar.gz +e0b5057a4e3166f34635ac6f27c712c0 desktop-file-utils-0.14.tar.gz From fb19d72978ec4e0ba55fd1c68b0683468f51346b Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 7 Dec 2007 02:48:39 +0000 Subject: [PATCH 03/12] drop unused patches --- ...ls-0.10-dont-use-unintialized-memory.patch | 11 ------- ...1-make-category-validation-non-fatal.patch | 20 ------------ ...file-utils-0.12-make-vendor-optional.patch | 31 ------------------- desktop-file-utils-0.9-nogroup.patch | 18 ----------- 4 files changed, 80 deletions(-) delete mode 100644 desktop-file-utils-0.10-dont-use-unintialized-memory.patch delete mode 100644 desktop-file-utils-0.11-make-category-validation-non-fatal.patch delete mode 100644 desktop-file-utils-0.12-make-vendor-optional.patch delete mode 100644 desktop-file-utils-0.9-nogroup.patch diff --git a/desktop-file-utils-0.10-dont-use-unintialized-memory.patch b/desktop-file-utils-0.10-dont-use-unintialized-memory.patch deleted file mode 100644 index 884f646..0000000 --- a/desktop-file-utils-0.10-dont-use-unintialized-memory.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- desktop-file-utils-0.10/src/update-desktop-database.c.dont-use-uninitialized-memory 2006-01-22 15:53:08.000000000 -0500 -+++ desktop-file-utils-0.10/src/update-desktop-database.c 2006-01-22 15:53:17.000000000 -0500 -@@ -444,7 +444,7 @@ - - for (i = 0; data_dirs[i] != NULL; i++); - -- args = g_new (char *, i + 1); -+ args = g_new0 (char *, i + 1); - - for (i = 0; data_dirs[i] != NULL; i++) - args[i] = g_build_filename (data_dirs[i], "applications", NULL); diff --git a/desktop-file-utils-0.11-make-category-validation-non-fatal.patch b/desktop-file-utils-0.11-make-category-validation-non-fatal.patch deleted file mode 100644 index ac6be31..0000000 --- a/desktop-file-utils-0.11-make-category-validation-non-fatal.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- desktop-file-utils-0.11/src/validate.c.make-category-validation-non-fatal 2006-04-18 18:03:13.000000000 -0400 -+++ desktop-file-utils-0.11/src/validate.c 2006-10-27 14:33:53.000000000 -0400 -@@ -208,7 +208,7 @@ - { - if (strcmp (vals[i], categories_keys[j]) != 0) - { -- print_fatal (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n", -+ print_warning (filename, "%s values are case sensitive (should be \"%s\" instead of \"%s\")\n", - key, categories_keys[j], vals[i]); - } - break; -@@ -221,7 +221,7 @@ - char *valid_categories; - - valid_categories = g_strjoinv ("\", \"", (gchar **) categories_keys); -- print_fatal (filename, "%s values must be one of \"%s\" (found \"%s\")\n", -+ print_warning (filename, "%s values must be one of \"%s\" (found \"%s\")\n", - key, valid_categories, vals[i]); - g_free (valid_categories); - } diff --git a/desktop-file-utils-0.12-make-vendor-optional.patch b/desktop-file-utils-0.12-make-vendor-optional.patch deleted file mode 100644 index 0ed9b93..0000000 --- a/desktop-file-utils-0.12-make-vendor-optional.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- desktop-file-utils-0.12/src/install.c 18 Apr 2006 22:08:10 -0000 1.18 -+++ desktop-file-utils-0.12/src/install.c 2 Feb 2007 19:43:27 -0000 -@@ -96,12 +96,10 @@ process_one_file (const char *filename, - GError *rebuild_error; - GSList *tmp; - -- g_assert (vendor_name); -- - dirname = g_path_get_dirname (filename); - basename = g_path_get_basename (filename); - -- if (!g_str_has_prefix (basename, vendor_name)) -+ if (vendor_name && !g_str_has_prefix (basename, vendor_name)) - { - char *new_base; - new_base = g_strconcat (vendor_name, "-", basename, NULL); -@@ -564,12 +562,6 @@ main (int argc, char **argv) - if (vendor_name == NULL) - vendor_name = g_strdup (g_getenv ("DESKTOP_FILE_VENDOR")); - -- if (vendor_name == NULL) -- { -- g_printerr (_("Must specify the vendor namespace for these files with --vendor\n")); -- return 1; -- } -- - if (copy_generic_name_to_name && copy_name_to_generic_name) - { - g_printerr (_("Specifying both --copy-name-to-generic-name and --copy-generic-name-to-name at once doesn't make much sense.\n")); - - diff --git a/desktop-file-utils-0.9-nogroup.patch b/desktop-file-utils-0.9-nogroup.patch deleted file mode 100644 index dc0b561..0000000 --- a/desktop-file-utils-0.9-nogroup.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- desktop-file-utils-0.9/src/eggdesktopentries.c.nogroup 2004-10-18 14:10:48.527841168 +0200 -+++ desktop-file-utils-0.9/src/eggdesktopentries.c 2004-10-18 14:19:33.102093760 +0200 -@@ -884,6 +884,15 @@ - gchar *key, *value, *key_end, *value_start, *locale; - gsize key_len, value_len; - -+ if (entries->current_group->name == NULL) -+ { -+ g_set_error (error, EGG_DESKTOP_ENTRIES_ERROR, -+ EGG_DESKTOP_ENTRIES_ERROR_BAD_START_GROUP, -+ _("desktop entry file does not start with " -+ "legal start group")); -+ return; -+ } -+ - key_end = value_start = strchr (line, '='); - - g_assert (key_end != NULL); From 22472e03d5082a9406fb7fc0f3d9ac7909788ec3 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 7 Dec 2007 02:56:00 +0000 Subject: [PATCH 04/12] - make icon extension a warning not an error --- ...le-utils-0.14-make-icon-extension-non-fatal.patch | 12 ++++++++++++ desktop-file-utils.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 desktop-file-utils-0.14-make-icon-extension-non-fatal.patch diff --git a/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch b/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch new file mode 100644 index 0000000..2e96912 --- /dev/null +++ b/desktop-file-utils-0.14-make-icon-extension-non-fatal.patch @@ -0,0 +1,12 @@ +diff -up desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal desktop-file-utils-0.14/src/validate.c +--- desktop-file-utils-0.14/src/validate.c.make-icon-extension-non-fatal 2007-12-06 21:52:11.000000000 -0500 ++++ desktop-file-utils-0.14/src/validate.c 2007-12-06 21:52:39.000000000 -0500 +@@ -737,7 +737,7 @@ handle_icon_key (kf_validator *kf, + if (g_str_has_suffix (value, ".png") || + g_str_has_suffix (value, ".xpm") || + g_str_has_suffix (value, ".svg")) { +- print_fatal (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon " ++ print_warning (kf, "value \"%s\" for key \"%s\" in group \"%s\" is an icon " + "name with an extension, but there should be no extension " + "as described in the Icon Theme Specification if the " + "value is not an absolute path\n", diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 7e87876..8dab2c3 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.14 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -14,6 +14,8 @@ BuildRequires: emacs Obsoletes: desktop-file-validator +Patch0: desktop-file-utils-0.14-make-icon-extension-non-fatal.patch + %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -24,6 +26,7 @@ fixing it up in the process. %prep %setup -q +%patch0 -p1 -b .make-icon-extension-non-fatal %build %configure @@ -43,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* Thu Dec 6 2007 Ray Strode 0.14-2 +- make icon extension a warning not an error + * Fri Nov 30 2007 Christopher Stone 0.14-1 - Upstream sync - Remove no longer needed short option patch From 8aa74d4a4360edad25d1010b3c9afb6fe1bc031b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 22:36:24 +0000 Subject: [PATCH 05/12] - Autorebuild for GCC 4.3 --- desktop-file-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 8dab2c3..76f2213 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.14 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 +- Autorebuild for GCC 4.3 + * Thu Dec 6 2007 Ray Strode 0.14-2 - make icon extension a warning not an error From f09170d0d898717916908d5f772eb2a03dcef2a7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 4 Mar 2008 14:57:55 +0000 Subject: [PATCH 06/12] 0.15 --- desktop-file-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 76f2213..125f701 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils -Version: 0.14 -Release: 3%{?dist} +Version: 0.15 +Release: 1%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -46,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* Tue Mar 4 2008 Matthias Clasen - 0.15-1 +- Update to 0.15 + * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 From 7e8c39b7f85c6fc1c2882784aac513e692dff122 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 4 Mar 2008 15:00:48 +0000 Subject: [PATCH 07/12] 0.15 --- .cvsignore | 2 +- desktop-file-utils.spec | 4 +--- sources | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0c6df40..a747c6a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -desktop-file-utils-0.14.tar.gz +desktop-file-utils-0.15.tar.gz diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 125f701..f6f83f1 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -14,8 +14,6 @@ BuildRequires: emacs Obsoletes: desktop-file-validator -Patch0: desktop-file-utils-0.14-make-icon-extension-non-fatal.patch - %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -26,7 +24,6 @@ fixing it up in the process. %prep %setup -q -%patch0 -p1 -b .make-icon-extension-non-fatal %build %configure @@ -48,6 +45,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Mar 4 2008 Matthias Clasen - 0.15-1 - Update to 0.15 +- Drop upstreamed patch * Tue Feb 19 2008 Fedora Release Engineering - 0.14-3 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 4a85355..77a1d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0b5057a4e3166f34635ac6f27c712c0 desktop-file-utils-0.14.tar.gz +2fe8ebe222fc33cd4a959415495b7eed desktop-file-utils-0.15.tar.gz From 9bd6f0df014f2f34146553665770c9e7f30e37e4 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 19 Mar 2008 14:06:41 +0000 Subject: [PATCH 08/12] - Drop old unneeded obsoletes on desktop-file-validator (bug 225681) --- desktop-file-utils.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index f6f83f1..68063cb 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.15 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz # https://bugs.freedesktop.org/show_bug.cgi?id=12018 @@ -12,8 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.12.0 BuildRequires: emacs -Obsoletes: desktop-file-validator - %description .desktop files are used to describe an application for inclusion in GNOME or KDE menus. This package contains desktop-file-validate which @@ -43,6 +41,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/emacs/site-lisp/ %changelog +* Wed Mar 19 2008 Ray Strode - 0.15-2 +- Drop old unneeded obsoletes on desktop-file-validator +(bug 225681) + * Tue Mar 4 2008 Matthias Clasen - 0.15-1 - Update to 0.15 - Drop upstreamed patch From 0fb5cc844ed2e637f70a5cd16b6f7bee8690fa81 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Fri, 2 May 2008 13:25:52 +0000 Subject: [PATCH 09/12] - Add desktop-mime-type.prov so that we can automatically generate mimetype provides for packages at build time. This lets us do some cool things with PackageKit in the future. --- desktop-file-utils.spec | 12 +++++++++++- desktop-mime-type.prov | 26 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 desktop-mime-type.prov diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 68063cb..ea420bb 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -1,9 +1,10 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.15 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.freedesktop.org/software/desktop-file-utils Source0: http://www.freedesktop.org/software/desktop-file-utils/releases/%{name}-%{version}.tar.gz +Source1: desktop-mime-type.prov # https://bugs.freedesktop.org/show_bug.cgi?id=12018 License: GPLv2+ Group: Development/Tools @@ -31,6 +32,9 @@ make rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# add the provides script +install -m0755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/rpm/desktop-mime-type.prov + %clean rm -rf $RPM_BUILD_ROOT @@ -39,8 +43,14 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README NEWS %{_bindir}/* %{_datadir}/emacs/site-lisp/ +%{_libdir}/rpm/desktop-mime-type.prov %changelog +* Fri May 02 2008 Richard Hughes - 0.15-3 +- Add desktop-mime-type.prov so that we can automatically + generate mimetype provides for packages at build time. + This lets us do some cool things with PackageKit in the future. + * Wed Mar 19 2008 Ray Strode - 0.15-2 - Drop old unneeded obsoletes on desktop-file-validator (bug 225681) diff --git a/desktop-mime-type.prov b/desktop-mime-type.prov new file mode 100644 index 0000000..da6291a --- /dev/null +++ b/desktop-mime-type.prov @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Script to install in: +# /usr/lib/rpm/redhat/find-provides.d +# +# Transform desktop mimetype info into RPM provides +# +# Author: Richard Hughes +# Based on other provides scripts from RPM +# + +#!/bin/sh +OLD_IFS="$IFS" +while read instfile ; do + case "$instfile" in + *.desktop) + mime=`cat $instfile | grep MimeType | cut -d'=' -f2` + IFS=';' + for type in $mime ; do + echo 'mimetype('$type')' + done + ;; + esac +done +IFS=$OLD_IFS + From aed6d0fc23d3ad5d78b50a8d6536e363d4e15001 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 05:04:40 +0000 Subject: [PATCH 10/12] Initialize branch F-10 for desktop-file-utils --- 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 2f9ba6f2885cf7a691965473f03660fae4338122 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:21:35 +0000 Subject: [PATCH 11/12] 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 0900450..df9d250 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: desktop-file-utils -# $Id: Makefile,v 1.1 2004/09/09 04:07:09 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:41:33 notting Exp $ NAME := desktop-file-utils 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 2a0c75bec71ba5ead997a1da61b709ffa4f47cc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 12:50:35 +0000 Subject: [PATCH 12/12] 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 df9d250..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: desktop-file-utils -# $Id: Makefile,v 1.2 2007/10/15 18:41:33 notting Exp $ -NAME := desktop-file-utils -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),) -# attempt 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