Update to 3.8.0

- added package with bash-completion
- removed obsolete patches

diff --git a/configure-gettext.patch b/configure-gettext.patch
deleted file mode 100644 (file)
index 30bd8de..0000000
--- a/configure-gettext.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 a8d8ff6014cde8b1821b180895ffe162f6109ab0..2589edb1e7ef424488a1f72ffac27e394267f143 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,7 +1,6 @@
 #
 # Conditional build:
 %bcond_without ibus    # ibus support need not yet released ibus 1.5 or at least devel 1.4.99 version
-%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 #
 Summary:       GNOME Control Center
 Summary(es.UTF-8):     El centro de controle del GNOME
@@ -10,62 +9,59 @@ Summary(pt_BR.UTF-8):        O Centro de Controle do GNOME
 Summary(ru.UTF-8):     Центр управления GNOME
 Summary(uk.UTF-8):     Центр керування GNOME
 Name:          gnome-control-center
-Version:       3.6.3
+Version:       3.8.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.6/%{name}-%{version}.tar.xz
-# Source0-md5: 13474a477658ccbca7484918edfc19d3
-Patch0:                system-locale-archive-path.patch
-Patch1:                configure-gettext.patch
-Patch2:                systemd-fallback.patch
-Patch3:                krb5.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.8/%{name}-%{version}.tar.xz
+# Source0-md5: de81d26dfeaf197100f47c2eef4599e9
+Patch0:                krb5.patch
 URL:           http://www.gnome.org/
+#BuildRequires:        ModemManager-devel >= 0.7
 # use libnm-gtk - will use correct NM version
-BuildRequires: NetworkManager-gtk-lib-devel >= 0.9.1.90-2
+BuildRequires: NetworkManager-gtk-lib-devel >= 0.9.8
+BuildRequires: OpenGL-devel
+BuildRequires: accountsservice-devel >= 0.6.30
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.11
 BuildRequires: cheese-devel >= 3.6.0
 BuildRequires: clutter-gtk-devel
-BuildRequires: colord-devel >= 0.1.8
+BuildRequires: colord-devel >= 0.1.29
+BuildRequires: colord-gtk-devel >= 0.1.24
 BuildRequires: cups-devel >= 1.4
-BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gdk-pixbuf2-devel >= 2.24.0
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: gnome-bluetooth-devel >= 3.6.0
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 3.6.0
+BuildRequires: gnome-desktop-devel >= 3.8.0
 BuildRequires: gnome-menus-devel >= 3.4.0
-BuildRequires: gnome-online-accounts-devel >= 3.6.0
-BuildRequires: gnome-settings-daemon-devel >= 1:3.6.0
-BuildRequires: gsettings-desktop-schemas-devel >= 3.6.0
+BuildRequires: gnome-online-accounts-devel >= 3.8.0
+BuildRequires: gnome-settings-daemon-devel >= 1:3.8.0
+BuildRequires: gsettings-desktop-schemas-devel >= 3.8.0
 BuildRequires: gstreamer-devel >= 1.0
-BuildRequires: gtk+3-devel >= 3.6.0
-BuildRequires: gtk-doc >= 1.9
+BuildRequires: gtk+3-devel >= 3.8.0
 BuildRequires: heimdal-devel
 %{?with_ibus:BuildRequires:    ibus-devel >= 1.4.99}
 BuildRequires: intltool >= 0.40.1
-BuildRequires: iso-codes
-BuildRequires: lcms2-devel
 BuildRequires: libcanberra-gtk3-devel >= 0.26
 BuildRequires: libgtop-devel
 BuildRequires: libnotify-devel >= 0.7.3
 BuildRequires: libpwquality-devel
 BuildRequires: libsocialweb-devel
 BuildRequires: libtool >= 2:2.2
-BuildRequires: libwacom-devel >= 0.6
+BuildRequires: libwacom-devel >= 0.7
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.103
 BuildRequires: pulseaudio-devel >= 2.0
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-%{?with_systemd:BuildRequires: systemd-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: upower-devel >= 0.9.1
+BuildRequires: xorg-lib-libXi-devel >= 1.2
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libxkbfile-devel
 BuildRequires: xz
@@ -76,10 +72,9 @@ Requires(post,postun):       shared-mime-info
 Requires:      accountsservice
 Requires:      cups-pk-helper
 Requires:      desktop-file-utils
-Requires:      gnome-settings-daemon >= 1:3.6.0
-Requires:      gsettings-desktop-schemas >= 3.6.0
+Requires:      gnome-settings-daemon >= 1:3.8.0
+Requires:      gsettings-desktop-schemas >= 3.8.0
 Requires:      hicolor-icon-theme
-Suggests:      apg
 Suggests:      libcanberra-gnome
 # info panel needs glxinfo
 Suggests:      mesa-utils
@@ -140,18 +135,26 @@ GNOME Control Center development files.
 %description devel -l pl.UTF-8
 Pliki programistyczne GNOME Control Center.
 
+%package -n bash-completion-gnome-control-center
+Summary:       bash-completion for gnome-control-center
+Summary(pl.UTF-8):     Bashowe uzupełnianie nazw dla gnome-control-center
+Group:         Applications/Shells
+Requires:      bash-completion >= 2.0
+
+%description -n bash-completion-gnome-control-center
+bash-completion for gnome-control-center.
+
+%description -n bash-completion-gnome-control-center -l pl.UTF-8
+Bashowe uzupełnianie nazw dla gnome-control-center.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%{?with_systemd:%patch2 -p1}
-%patch3 -p1
 
 %build
-%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4 -I libgd
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -159,7 +162,6 @@ Pliki programistyczne GNOME Control Center.
        --disable-silent-rules \
        --disable-update-mimedb \
        --with-libsocialweb \
-       %{__enable_disable systemd systemd} \
        %{__enable_disable ibus ibus} \
        X_EXTRA_LIBS="-lXext"
 %{__make}
@@ -170,9 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# no static modules - shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.{a,la}
-
 %find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
@@ -192,35 +191,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/gnome-control-center
-%attr(755,root,root) %{_bindir}/gnome-sound-applet
-%dir %{_libdir}/control-center-1
-%dir %{_libdir}/control-center-1/panels
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libbackground.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libbluetooth.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libcolor.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libdate_time.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libdisplay.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libinfo.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libkeyboard.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libmouse-properties.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libnetwork.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libonline-accounts.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libregion.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libsound.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libpower.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libprinters.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libscreen.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libuniversal-access.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libuser-accounts.so
-%attr(755,root,root) %{_libdir}/control-center-1/panels/libwacom-properties.so
-%{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
-%{_sysconfdir}/xdg/menus/gnomecc.menu
+%attr(755,root,root) %{_libdir}/cc-remote-login-helper
+%attr(755,root,root) %{_libdir}/gnome-control-center-search-provider
+%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
+%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
+%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
 %{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/gnome-control-center
 %{_datadir}/sounds/gnome
-%{_datadir}/desktop-directories/*.directory
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_desktopdir}/*.desktop
@@ -230,3 +210,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_npkgconfigdir}/gnome-keybindings.pc
+
+%files -n bash-completion-gnome-control-center
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/gnome-control-center

diff --git a/system-locale-archive-path.patch b/system-locale-archive-path.patch
deleted file mode 100644 (file)
index c97cb1a..0000000
--- a/system-locale-archive-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gnome-control-center-2.91.91/panels/common/Makefile.am.orig        2011-03-14 21:43:54.706666004 +0000
-+++ gnome-control-center-2.91.91/panels/common/Makefile.am     2011-03-14 21:48:44.700000373 +0000
-@@ -8,6 +8,7 @@
-       $(LIBLANGUAGE_CFLAGS)                           \
-       -DDATADIR=\""$(datadir)"\"                      \
-       -DUIDIR=\""$(pkgdatadir)/ui"\"                  \
-+      -DLIBDIR=\""$(libdir)"\"                        \
-       -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\"       \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-       -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
---- gnome-control-center-2.91.91/panels/common/gdm-languages.c.orig    2011-03-14 21:38:11.669999713 +0000
-+++ gnome-control-center-2.91.91/panels/common/gdm-languages.c 2011-03-14 21:47:55.906666990 +0000
-@@ -47,7 +47,7 @@
- 
- #define ALIASES_FILE DATADIR "/gdm/locale.alias"
- #define ARCHIVE_FILE LIBLOCALEDIR "/locale-archive"
--#define SYSTEM_ARCHIVE_FILE "/usr/lib/locale/locale-archive"
-+#define SYSTEM_ARCHIVE_FILE LIBDIR "/locale/locale-archive"
- #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
- #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
- 

diff --git a/systemd-fallback.patch b/systemd-fallback.patch
deleted file mode 100644 (file)
index 709e540..0000000
--- a/systemd-fallback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 9873a7536844f5c38c2a123be58175c2774e5dcc
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:12:11 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index aee97ac..867f061 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  SYSTEMD=libsystemd-login
-+  SYSTEMD="libsystemd-login libsystemd-daemon"
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
-   SYSTEMD=
-diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
-index f027754..5ebbe29 100644
---- a/panels/user-accounts/um-user.c
-+++ b/panels/user-accounts/um-user.c
-@@ -37,6 +37,11 @@
- 
- #include <gio/gunixoutputstream.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-login.h>
-+#  include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
-         }
- }
- 
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
--  int n_sessions;
--
--  n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
--  return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                int n_sessions;
- 
--#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
- 
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-+                return n_sessions > 0;
-+        }
-+#endif
-         GVariant *result;
-         GVariantIter *iter;
-         gint n_sessions;
-@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
-         return n_sessions > 0;
- }
- 
--#endif
--
- void
- um_user_set_automatic_login (UmUser   *user,
-                              gboolean  enabled)