From 176a75822e808ba8a206369ce6ac6f915d7a4d47 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 18 Nov 2009 19:15:09 +0000 Subject: [PATCH 1/4] - Update to 0.2.6 --- .cvsignore | 2 +- menu-cache.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index aaffde2..90bb41a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -menu-cache-0.2.5.tar.gz +menu-cache-0.2.6.tar.gz diff --git a/menu-cache.spec b/menu-cache.spec index a165897..585f269 100644 --- a/menu-cache.spec +++ b/menu-cache.spec @@ -1,6 +1,6 @@ Name: menu-cache -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: Caching mechanism for freedesktop.org compliant menus Group: System Environment/Libraries @@ -10,6 +10,7 @@ Source0: http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= 2.16.0 +BuildRequires: chrpath Requires: redhat-menus %description @@ -41,6 +42,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/menu-cache-gen %clean @@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 10 2009 Christoph Wickert - 0.2.6-1 +- Update to 0.2.6 + * Sat Jul 25 2009 Fedora Release Engineering - 0.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 2a163a3..71df6f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4537aba7abb379d5a055b2da5adb51bd menu-cache-0.2.5.tar.gz +114498e13525dd13cbfdce513d22b083 menu-cache-0.2.6.tar.gz From e55ce9972ce33f26761727fa71e9a8f1e646d3f8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:12 +0000 Subject: [PATCH 2/4] 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 900be75..c2f840c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := menu-cache 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 9160fef29a20d1164d5b962a4aaf86adcd9bea32 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:58:48 +0000 Subject: [PATCH 3/4] Initialize branch EL-6 for menu-cache --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From ea719b344868ada7aed6b6ef42d7349d702c76c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:09:25 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 c2f840c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: menu-cache -# $Id$ -NAME := menu-cache -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index 06bf3c0..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -menu-cache-0_2_2-1_fc11:HEAD:menu-cache-0.2.2-1.fc11.src.rpm:1235697658