From a25b033f4382fce7aad318d80f60624e80d94051 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:13:12 +0000 Subject: [PATCH 1/5] Initialize branch F-10 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..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 9f9092a3bf811253c6ee87a7a36c49a774d940a8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 31 Dec 2008 21:52:21 +0000 Subject: [PATCH 2/5] - resurrect latest kde4-enabled version, yay. --- .cvsignore | 1 + sources | 1 + xsettings-kde-0.9-kde4.patch | 12 ++++ xsettings-kde-0.9-svn_checkout.sh | 17 +++++ xsettings-kde.desktop | 8 +++ xsettings-kde.spec | 101 ++++++++++++++++++++++++++++++ 6 files changed, 140 insertions(+) create mode 100644 xsettings-kde-0.9-kde4.patch create mode 100755 xsettings-kde-0.9-svn_checkout.sh create mode 100644 xsettings-kde.desktop create mode 100644 xsettings-kde.spec diff --git a/.cvsignore b/.cvsignore index e69de29..3999039 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xsettings-kde-0.9-20081230svn.tar.bz2 diff --git a/sources b/sources index e69de29..fd0776a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +4bcb0db445ced7c585755625e0f2c9df xsettings-kde-0.9-20081230svn.tar.bz2 diff --git a/xsettings-kde-0.9-kde4.patch b/xsettings-kde-0.9-kde4.patch new file mode 100644 index 0000000..ef9ee73 --- /dev/null +++ b/xsettings-kde-0.9-kde4.patch @@ -0,0 +1,12 @@ +diff -up xsettings-kde-0.9/xsettings-kde.c.kde4 xsettings-kde-0.9/xsettings-kde.c +--- xsettings-kde-0.9/xsettings-kde.c.kde4 2008-09-29 12:44:27.000000000 -0500 ++++ xsettings-kde-0.9/xsettings-kde.c 2008-12-30 23:34:27.000000000 -0600 +@@ -232,7 +232,7 @@ void readConfig () { + + user_file = 1; + if ((password = getpwuid (geteuid()))) { +- sprintf(filename, "%s/%s/share/config/%s",password->pw_dir, is_kde4 ? ".kde4" : ".kde", file_name[file_index]); ++ sprintf(filename, "%s/%s/share/config/%s",password->pw_dir, ".kde" , file_name[file_index]); + + if (access (filename, F_OK) == 0) { + file = fopen (filename, "r"); diff --git a/xsettings-kde-0.9-svn_checkout.sh b/xsettings-kde-0.9-svn_checkout.sh new file mode 100755 index 0000000..2ae30af --- /dev/null +++ b/xsettings-kde-0.9-svn_checkout.sh @@ -0,0 +1,17 @@ +#/bin/sh + +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/ + +set -x +rm -rf $MODULE + +svn export $SVNROOT $MODULE + +## tar it up +tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE + +## cleanup +rm -rf $MODULE + diff --git a/xsettings-kde.desktop b/xsettings-kde.desktop new file mode 100644 index 0000000..c517f1c --- /dev/null +++ b/xsettings-kde.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=xsettings-kde +Name=XSettings-KDE +X-KDE-autostart-after=kdesktop +Type=Service +OnlyShowIn=KDE; + + diff --git a/xsettings-kde.spec b/xsettings-kde.spec new file mode 100644 index 0000000..5fa2c20 --- /dev/null +++ b/xsettings-kde.spec @@ -0,0 +1,101 @@ + +Summary: XSettings Daemon for KDE +Name: xsettings-kde +Version: 0.9 +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 +URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/theme/xsettings-kde/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +# fedora doesn't use ~/.kde4 like mandriva +Patch1: xsettings-kde-0.9-kde4.patch + +Source10: xsettings-kde.desktop + +BuildRequires: libX11-devel + +%description +This package provides a XSettings daemon for KDE Desktop Environment. +It allows XSettings aware applications (all GTK+ 2 and GNOME 2 applications) +to be informed instantly of changes in KDE configuration, such as theme name, +default font and so on. + + +%prep +%setup -q + +%patch1 -p1 -b .kde4 + + +%build + +make %{?_smp_mflags} CFLAGS="%{optflags}" lib=%{_lib} + + +%install +rm -rf %{buildroot} + +install -p -m755 -D xsettings-kde %{buildroot}%{_bindir}/xsettings-kde + +install -p -m644 -D %{SOURCE10} \ + %{buildroot}%{_datadir}/autostart/xsettings-kde.desktop + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc ChangeLog README COPYING +%{_bindir}/* +%{_datadir}/autostart/* + + +%changelog +* Tue Dec 30 2008 Rex Dieter 0.9-1 +- resurrect latest kde4-enabled version, yay. + +* Sun Jan 27 2008 Manuel Wolfshant 0.6-3 +- small fixes + +* Sun Dec 30 2007 Rex Dieter 0.6-2 +- fedora-ize + +* Wed Sep 26 2007 Frederic Crozat 0.6-1mdv2008.0 ++ Revision: 93073 +- Release 0.6 : + -failover correctly when some configuration files aren't present + +* Fri Sep 21 2007 Frederic Crozat 0.5-1mdv2008.0 ++ Revision: 91946 +- Release 0.5 + - handle multiple kde profiles specified as prefixes + +* Fri Aug 31 2007 Adam Williamson 0.4-2mdv2008.0 ++ Revision: 76611 +- rebuild for 2008 +- don't package COPYING +- Import xsettings-kde + +* Wed Sep 13 2006 Frederic Crozat 0.4-1mdv2007.0 +- Release 0.4 : + * change theme according to color scheme for Ia Ora (Mdv bug #25574) + * fix theme detection + * support kde profile + * don't change theme if ~/.gtkrc-2.0 exists + +* Mon Mar 06 2006 Frederic Crozat 0.3-1mdk +- Release 0.3 : + - support Net/FallbackIconTheme, fix Mdk bug #19441) + +* Thu Aug 25 2005 Frederic Crozat 0.2-1mdk +- Release 0.2 : + - force gnome-vfs gtk2 file selector backend + +* Wed Jul 27 2005 Frederic Crozat 0.1-1mdk +- Initial package From 9d5f851d18cce5155ae3ff75ce01af4c6094d6af Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Oct 2009 14:35:59 +0000 Subject: [PATCH 3/5] - xsettings-0.11 --- .cvsignore | 2 +- sources | 2 +- ...t.sh => xsettings-kde-0.11-svn_checkout.sh | 2 +- xsettings-kde.desktop | 2 -- xsettings-kde.spec | 19 ++++++++++++++++--- 5 files changed, 19 insertions(+), 8 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 5fa2c20..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 +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,18 @@ 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 + * Tue Dec 30 2008 Rex Dieter 0.9-1 - resurrect latest kde4-enabled version, yay. From f770d1255d4184f42e210e526e552cb40b517170 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:14 +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 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 64a6f22e91d2bc9b0d1c3420b633fb5b593321ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:13:17 +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 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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10