From 8b15986576fd21f21b262355c70584dfd581294e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:29:30 +0000 Subject: [PATCH 1/5] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 7bad74845339f0d4afe3f9b893fe46ead0a2d4ea Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 18 Nov 2009 19:15:09 +0000 Subject: [PATCH 2/5] - 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 0423b6eb1727850b991960522bab0473bcfca671 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:34:12 +0000 Subject: [PATCH 3/5] 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 d75763ca13f12876cea7b99125dacd17101c0046 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:09:23 +0000 Subject: [PATCH 4/5] 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 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 From c05e6314722d154624c1a103775eadb80a820273 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 31 Jul 2010 01:30:42 +0200 Subject: [PATCH 5/5] * Sat Feb 27 2010 Christoph Wickert - 0.3.2-1 - Update to 0.3.2 --- .gitignore | 2 +- menu-cache.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 90bb41a..935d1a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -menu-cache-0.2.6.tar.gz +menu-cache-0.3.2.tar.gz diff --git a/menu-cache.spec b/menu-cache.spec index 585f269..015d934 100644 --- a/menu-cache.spec +++ b/menu-cache.spec @@ -1,5 +1,5 @@ Name: menu-cache -Version: 0.2.6 +Version: 0.3.2 Release: 1%{?dist} Summary: Caching mechanism for freedesktop.org compliant menus @@ -10,7 +10,6 @@ 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 @@ -35,6 +34,10 @@ developing applications that use %{name}. %build %configure --disable-static +# remove rpath in menu-cache-gen +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} @@ -42,7 +45,6 @@ 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 @@ -73,6 +75,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 27 2010 Christoph Wickert - 0.3.2-1 +- Update to 0.3.2 + +* Sun Feb 21 2010 Christoph Wickert - 0.3.1-1 +- Update to 0.3.1 + * Tue Nov 10 2009 Christoph Wickert - 0.2.6-1 - Update to 0.2.6 diff --git a/sources b/sources index 71df6f5..969b7ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -114498e13525dd13cbfdce513d22b083 menu-cache-0.2.6.tar.gz +ac4a9ea77db68d3db3f9f53cc75af66a menu-cache-0.3.2.tar.gz