From 18458b62b28362ef9c71034b7b64915789643d87 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:20:46 +0000 Subject: [PATCH 1/5] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 686f4a5b19efa6b01d54eb9b8d19febb7a44cc65 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 20:37:29 +0000 Subject: [PATCH 2/5] Update License tag --- xfce4-icon-theme.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index 2fb50bc..2391708 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,8 +1,8 @@ Summary: Icons for Xfce Name: xfce4-icon-theme Version: 4.4.1 -Release: 1%{?dist} -License: GPL +Release: 2%{?dist} +License: GPLv2+ URL: http://www.xfce.org/ Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce4-icon-theme-4.4.1.tar.bz2 Group: User Interface/Desktops @@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-2 +- Update License tag + * Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 - Update to 4.4.1 From ac9a83cd6ceb0a385a826ac1b28feee87a54f19f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Dec 2007 04:08:53 +0000 Subject: [PATCH 3/5] Update to 4.4.2 --- .cvsignore | 2 +- sources | 2 +- xfce4-icon-theme.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 04cc54a..403f65b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-icon-theme-4.4.1.tar.bz2 +xfce4-icon-theme-4.4.2.tar.bz2 diff --git a/sources b/sources index 3421706..af1e94d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -934b805a179c049159b16f9fd0c906b7 xfce4-icon-theme-4.4.1.tar.bz2 +d3e3e64596a7efa857d2e6bb0cbd09bb xfce4-icon-theme-4.4.2.tar.bz2 diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index 2391708..bc258eb 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,15 +1,16 @@ Summary: Icons for Xfce Name: xfce4-icon-theme -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce4-icon-theme-4.4.1.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-icon-theme-4.4.2.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 %description Icon theme for Xfce 4 Desktop Environment. @@ -38,6 +39,12 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 + +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 +- Add BuildRequires: gawk + * Mon Aug 27 2007 Kevin Fenzi - 4.4.1-2 - Update License tag From 5e383387c7bafc7137b774271a0433f958ab9c6c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:22 +0000 Subject: [PATCH 4/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 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 211fe8e0c63a2bf118c8e2d8094bb7e5bdd5fa7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:44:38 +0000 Subject: [PATCH 5/5] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7