From 248b424f006b851efa61562c723d7d2b91bd6671 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:36:52 +0000 Subject: [PATCH 1/7] Initialize branch FC-6 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..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From af14da44f8c21cbeec2c990ef0b612ad4ee5cebf Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 11 Nov 2006 19:32:14 +0000 Subject: [PATCH 2/7] Update to 4.3.99.2 --- .cvsignore | 2 +- sources | 2 +- xfce4-icon-theme.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c8b6d2..c443522 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-icon-theme-4.3.99.1.tar.bz2 +xfce4-icon-theme-4.3.99.2.tar.bz2 diff --git a/sources b/sources index 6fe7ceb..403da1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ccdcd6aa7e03732347d785a826c81f84 xfce4-icon-theme-4.3.99.1.tar.bz2 +e8ad35bc50a84f620848f841d5167fb9 xfce4-icon-theme-4.3.99.2.tar.bz2 diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index d402344..c5761fb 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,10 +1,10 @@ Summary: Icons for Xfce Name: xfce4-icon-theme -Version: 4.3.99.1 -Release: 3%{?dist} +Version: 4.3.99.2 +Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfce4-icon-theme-4.3.99.1.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 +- Update to 4.3.99.2 + * Thu Oct 5 2006 Kevin Fenzi - 4.3.99.1-3 - Fix defattr From 11925fac2a818b6c454a53a20daaa42438d622d0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 27 Jan 2007 21:14:42 +0000 Subject: [PATCH 3/7] Update to 4.4.0 --- .cvsignore | 2 +- sources | 2 +- xfce4-icon-theme.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c443522..d841d18 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-icon-theme-4.3.99.2.tar.bz2 +xfce4-icon-theme-4.4.0.tar.bz2 diff --git a/sources b/sources index 403da1a..f4a8805 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8ad35bc50a84f620848f841d5167fb9 xfce4-icon-theme-4.3.99.2.tar.bz2 +69cf43b167e93e89a8c504d5d18e1142 xfce4-icon-theme-4.4.0.tar.bz2 diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index c5761fb..791b0c8 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,10 +1,10 @@ Summary: Icons for Xfce Name: xfce4-icon-theme -Version: 4.3.99.2 +Version: 4.4.0 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.3.99.2/src/xfce4-icon-theme-4.3.99.2.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce4-icon-theme-4.4.0.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -33,10 +33,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README ChangeLog NEWS COPYING AUTHORS -%{_datadir}/* +%{_datadir}/icons/* +%{_datadir}/xfce4/ %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 +- Update to 4.4.0 + * Fri Nov 10 2006 Kevin Fenzi - 4.3.99.2-1 - Update to 4.3.99.2 From 18eed97391c4c764be4a5a3f49caa3fa5011772a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 23 Apr 2007 02:38:48 +0000 Subject: [PATCH 4/7] Update to 4.4.1 --- .cvsignore | 2 +- sources | 2 +- xfce4-icon-theme.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d841d18..04cc54a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-icon-theme-4.4.0.tar.bz2 +xfce4-icon-theme-4.4.1.tar.bz2 diff --git a/sources b/sources index f4a8805..3421706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69cf43b167e93e89a8c504d5d18e1142 xfce4-icon-theme-4.4.0.tar.bz2 +934b805a179c049159b16f9fd0c906b7 xfce4-icon-theme-4.4.1.tar.bz2 diff --git a/xfce4-icon-theme.spec b/xfce4-icon-theme.spec index 791b0c8..2fb50bc 100644 --- a/xfce4-icon-theme.spec +++ b/xfce4-icon-theme.spec @@ -1,10 +1,10 @@ Summary: Icons for Xfce Name: xfce4-icon-theme -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.0/src/xfce4-icon-theme-4.4.0.tar.bz2 +Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfce4-icon-theme-4.4.1.tar.bz2 Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT %exclude %{_libdir}/pkgconfig/xfce4-icon-theme-1.0.pc %changelog +* Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 +- Update to 4.4.1 + * Sun Jan 21 2007 Kevin Fenzi - 4.4.0-1 - Update to 4.4.0 From 1e008aa70ad222e1217701698cc1bbb1c22bbd85 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 27 Aug 2007 20:39:07 +0000 Subject: [PATCH 5/7] 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 07bd59b58e607acfe144427bb041b1c54273f8af Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:31:24 +0000 Subject: [PATCH 6/7] 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 c7b99b0b6022e0ca8b9bfa3e1e48f0552e173277 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:44:46 +0000 Subject: [PATCH 7/7] 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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6