- revert df9bcf2382473c7ad8ef59cd245502e628c6eb1e from mainstream

Changed files:
    configure-gettext.patch -> 1.1
    gnome-control-center.spec -> 1.54

diff --git a/configure-gettext.patch b/configure-gettext.patch
new file mode 100644 (file)
index 0000000..30bd8de
--- /dev/null
+++ b/configure-gettext.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,9 @@ GNOME_DOC_INIT
+ 
+ IT_PROG_INTLTOOL([0.40.1])
+ 
++AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT([external])
++
+ GETTEXT_PACKAGE=gnome-control-center-2.0
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 3235a67213577828add387400f02a0c8d4aef3fa..49989413a9f49567a0d8650f4ccf7b8180b864ae 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -14,12 +14,13 @@ Source0:    http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.0/%{name}
 # Source0-md5: 5b5601fbae8be38a313a169b0fb4d9bf
 # PLD-specific patches
 Patch0:                system-locale-archive-path.patch
+Patch1:                configure-gettext.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.8.996
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.10
-BuildRequires: cheese-devel >= 3.0.1
+#BuildRequires:        cheese-devel >= 3.0.1
 BuildRequires: cups-devel >= 1.4
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
@@ -141,6 +142,7 @@ Pliki nagłówkowe bibliotek GNOME Control Center.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gnome_doc_prepare}