- removed locale.patch - resolved upstream

Changed files:
    gnome-control-center.spec -> 1.48
    locale.patch -> 1.3

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 8f0e606bdc490f0abc9fe5671086c7ce797f3c71..5e37efb0278571ec40dd985aa2113053e5390db6 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -12,9 +12,8 @@ License:      GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.0/%{name}-%{version}.tar.bz2
 # Source0-md5: 95df9948e7476bc691ee7dc182e11104
-Patch0:                locale.patch
 # PLD-specific patches
-Patch1:                system-locale-archive-path.patch
+Patch0:                system-locale-archive-path.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.8.996
@@ -143,7 +142,6 @@ Pliki nagłówkowe bibliotek GNOME Control Center.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}

diff --git a/locale.patch b/locale.patch
deleted file mode 100644 (file)
index 8ef3a44..0000000
--- a/locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-control-center-2.91.91/panels/datetime/test-endianess.c.wiget        2011-03-09 22:20:32.258478986 +0100
-+++ gnome-control-center-2.91.91/panels/datetime/test-endianess.c      2011-03-09 22:29:36.436369996 +0100
-@@ -38,7 +38,7 @@ int main (int argc, char **argv)
-               return 0;
-       }
- 
--      dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
-+      dir = g_dir_open ("/usr/share/locale/", 0, NULL);
-       if (dir == NULL)
-               return 1;
-