From e5640f31d112aacabe686afcdfeb88e6fd099dee Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:56:34 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for xsettings-kde --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 22fbf542a1627cc6974abf29cc9a1bd7a30529bf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Oct 2009 14:35:19 +0000 Subject: [PATCH 2/4] - xsettings-0.11 --- .cvsignore | 2 +- sources | 2 +- ...ut.sh => xsettings-kde-0.11-svn_checkout.sh | 2 +- xsettings-kde.desktop | 2 -- xsettings-kde.spec | 18 ++++++++++++++---- 5 files changed, 17 insertions(+), 9 deletions(-) rename xsettings-kde-0.9-svn_checkout.sh => xsettings-kde-0.11-svn_checkout.sh (95%) diff --git a/.cvsignore b/.cvsignore index 3999039..aff6366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xsettings-kde-0.9-20081230svn.tar.bz2 +xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/sources b/sources index fd0776a..5dd0ba4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 +ec6f797883068c1c25609d864e425cd8 xsettings-kde-0.11-20090829svn.tar.bz2 diff --git a/xsettings-kde-0.9-svn_checkout.sh b/xsettings-kde-0.11-svn_checkout.sh similarity index 95% rename from xsettings-kde-0.9-svn_checkout.sh rename to xsettings-kde-0.11-svn_checkout.sh index 2ae30af..4023bdf 100755 --- a/xsettings-kde-0.9-svn_checkout.sh +++ b/xsettings-kde-0.11-svn_checkout.sh @@ -2,7 +2,7 @@ DATE=$(date +%Y%m%d) MODULE="$(basename $0 -svn_checkout.sh)" -SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_9_1mdv/ +SVNROOT=http://svn.mandriva.com/svn/soft/theme/xsettings-kde/tags/V0_11_1mdv/ set -x rm -rf $MODULE diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop index c517f1c..3c26a6c 100644 --- a/xsettings-kde.desktop +++ b/xsettings-kde.desktop @@ -4,5 +4,3 @@ Name=XSettings-KDE X-KDE-autostart-after=kdesktop Type=Service OnlyShowIn=KDE; - - diff --git a/xsettings-kde.spec b/xsettings-kde.spec index b1ae12e..d0403d7 100644 --- a/xsettings-kde.spec +++ b/xsettings-kde.spec @@ -1,13 +1,13 @@ Summary: XSettings Daemon for KDE Name: xsettings-kde -Version: 0.9 -Release: 2%{?dist} +Version: 0.11 +Release: 1%{?dist} License: GPLv2+ Group: User Interface/Desktops # upstream is a svn -Source0: %{name}-%{version}-20081230svn.tar.bz2 -Source1: xsettings-kde-0.9-svn_checkout.sh +Source0: %{name}-%{version}-20090829svn.tar.bz2 +Source1: xsettings-kde-%{version}-svn_checkout.sh URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,6 +16,7 @@ Patch1: xsettings-kde-0.9-kde4.patch Source10: xsettings-kde.desktop +BuildRequires: glib2-devel BuildRequires: libX11-devel %description @@ -57,6 +58,15 @@ rm -rf %{buildroot} %changelog +* Sat Aug 29 2009 Rex Dieter - 0.11-1 +- xsettings-0.11 + +* Mon Jul 27 2009 Fedora Release Engineering - 0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jun 26 2009 Rex Dieter - 0.10-1 +- xsettings-0.10 + * Thu Feb 26 2009 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From e0a381b47ebb6d1d1d9b79b059b53dca868438ae Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:14 +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 1513d4d..4598aec 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xsettings-kde 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 d683a0415a7b853e979262c78a200632b9e004f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:13:19 +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 4598aec..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xsettings-kde -# $Id$ -NAME := xsettings-kde -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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11