From e60b96c09e350519f4748e03a00ff44253cf7da8 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:02:33 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 7801cb1434d9158426cd4ac975551e59452403d7 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 21 Feb 2010 22:42:56 +0000 Subject: [PATCH 2/4] - Update to 0.3.1 --- .cvsignore | 2 +- menu-cache.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 90bb41a..d73a23e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -menu-cache-0.2.6.tar.gz +menu-cache-0.3.1.tar.gz diff --git a/menu-cache.spec b/menu-cache.spec index 585f269..54c693c 100644 --- a/menu-cache.spec +++ b/menu-cache.spec @@ -1,5 +1,5 @@ Name: menu-cache -Version: 0.2.6 +Version: 0.3.1 Release: 1%{?dist} Summary: Caching mechanism for freedesktop.org compliant menus @@ -73,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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..4fbb685 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -114498e13525dd13cbfdce513d22b083 menu-cache-0.2.6.tar.gz +311949c715333590d8bbc54682d8c60c menu-cache-0.3.1.tar.gz From b88bb3e369d26148ca18fd0ab4be322832c55742 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 27 Feb 2010 18:07:17 +0000 Subject: [PATCH 3/4] - Update to 0.3.2 --- .cvsignore | 2 +- menu-cache.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d73a23e..935d1a8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -menu-cache-0.3.1.tar.gz +menu-cache-0.3.2.tar.gz diff --git a/menu-cache.spec b/menu-cache.spec index 54c693c..015d934 100644 --- a/menu-cache.spec +++ b/menu-cache.spec @@ -1,5 +1,5 @@ Name: menu-cache -Version: 0.3.1 +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,9 @@ 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 diff --git a/sources b/sources index 4fbb685..969b7ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -311949c715333590d8bbc54682d8c60c menu-cache-0.3.1.tar.gz +ac4a9ea77db68d3db3f9f53cc75af66a menu-cache-0.3.2.tar.gz From 91b3892478aec800c1a9669d8d2dde4d46316587 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 03:09:21 +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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 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