From fc41ea6fa22e2cacb3ea75afc5d183dc204fd94e Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Tue, 12 Feb 2008 14:04:43 +0000
Subject: [PATCH] - Update to 0.7 - Uncomment missing patches

---
 .cvsignore             |  2 +-
 kde.patch              |  4 ++--
 sources                |  2 +-
 xdg-user-dirs-gtk.spec | 22 ++++++++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index baf2357..74bb0e2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xdg-user-dirs-gtk-0.6.tar.gz
+xdg-user-dirs-gtk-0.7.tar.bz2
diff --git a/kde.patch b/kde.patch
index 857a917..4ce714e 100644
--- a/kde.patch
+++ b/kde.patch
@@ -1,6 +1,6 @@
 diff -up xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop.kde xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop
---- xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop.kde	2007-07-06 15:34:05.000000000 -0400
-+++ xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop	2007-07-06 15:34:25.000000000 -0400
+--- xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop.in.kde	2007-07-06 15:34:05.000000000 -0400
++++ xdg-user-dirs-gtk-0.5/user-dirs-update-gtk.desktop.in	2007-07-06 15:34:25.000000000 -0400
 @@ -5,3 +5,5 @@ Name=User folders update
  Terminal=false
  OnlyShowIn=GNOME;
diff --git a/sources b/sources
index c491787..38493b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03d3d42f864b6b9ebe85f2558af0886c  xdg-user-dirs-gtk-0.6.tar.gz
+dcd034be77af257fa3d89178f12598a4  xdg-user-dirs-gtk-0.7.tar.bz2
diff --git a/xdg-user-dirs-gtk.spec b/xdg-user-dirs-gtk.spec
index 7630f17..fb924b9 100644
--- a/xdg-user-dirs-gtk.spec
+++ b/xdg-user-dirs-gtk.spec
@@ -1,17 +1,16 @@
 Name:		xdg-user-dirs-gtk
-Version:	0.6
-Release:	4%{?dist}
+Version:	0.7
+Release:	1%{?dist}
 Summary:	Gnome integration of special directories
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://freedesktop.org/wiki/Software/xdg-user-dirs
-Source0:	http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.gz
+Source0:	http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.bz2
 Patch0:         kde.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=12640
-Patch1:		specialcase-en.patch
-Patch2:		polish.patch
-Patch3:		content-hint.patch
+# Where is these patches, not in cvs? /Alex
+#Patch2:		polish.patch
+#Patch3:		content-hint.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gettext, gtk2-devel, pkgconfig, perl-XML-Parser, xdg-user-dirs
@@ -25,9 +24,8 @@ locale changes.
 %prep
 %setup -q
 %patch0 -p1 -b .kde
-%patch1 -p1 -b .specialcase-en
-%patch2 -p1 -b .polish
-%patch3 -p1 -b .content-hint
+#%patch2 -p1 -b .polish
+#%patch3 -p1 -b .content-hint
 
 %build
 %configure
@@ -50,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
 
 %changelog
+* Tue Feb 12 2008 Alexander Larsson <alexl@redhat.com> - 0.7-1
+- Update to 0.7
+- Uncomment missing patches
+
 * Sun Nov  4 2007 Matthias Clasen <mclasen@redhat.com> - 0.6-4
 - Correct the URL