From 829c06bcc254c68985d49e6febb76323dc49c605 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 22 Apr 2008 02:18:21 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for xfce4-icon-theme --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From ce3f4215a8dc231a4916f7d5283b30459b9ef2dd Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 2 Feb 2009 01:34:16 +0000 Subject: [PATCH 2/4] - Update to 4.4.3 - BuildRequire intltool --- .cvsignore | 2 +- sources | 2 +- xfce4-icon-theme.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 403f65b..326772f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-icon-theme-4.4.2.tar.bz2 +xfce4-icon-theme-4.4.3.tar.bz2 diff --git a/sources b/sources index af1e94d..3c8fe19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3e3e64596a7efa857d2e6bb0cbd09bb xfce4-icon-theme-4.4.2.tar.bz2 +73ce2977b84f634a6a6c5d9c27e336db xfce4-icon-theme-4.4.3.tar.bz2 diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index bc258eb..36f1de7 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,16 +1,17 @@ Summary: Icons for Xfce Name: xfce4-icon-theme -Version: 4.4.2 +Version: 4.4.3 Release: 1%{?dist} License: GPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-icon-theme-%{version}.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Obsoletes: xffm-icons <= %{version}-%{release} Provides: xffm-icons = %{version}-%{release} BuildRequires: gawk +BuildRequires: gettext intltool %description Icon theme for Xfce 4 Desktop Environment. @@ -39,6 +40,10 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 +- Update to 4.4.3 +- BuildRequire intltool + * Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 - Update to 4.4.2 From d06ebd1bbc0499b27643d4d252898c0e82d8497c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:23 +0000 Subject: [PATCH 3/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 5ffdb25..075d0fa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-icon-theme 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 2fbac9d43a176442b4af21b9dc486a8ffb5ead0d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:44:44 +0000 Subject: [PATCH 4/4] 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 075d0fa..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-icon-theme -# $Id$ -NAME := xfce4-icon-theme -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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9