From 3562596d8fe9e08608dbf153bab5f0584d650e3c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 29 Apr 2015 21:31:59 -0500 Subject: gnome-applets 3.14.0 --- .gitignore | 1 + gnome-applets-cpupower.patch | 6 +- gnome-applets.spec | 145 ++++++++++++------------------------------- sources | 2 +- 4 files changed, 43 insertions(+), 111 deletions(-) diff --git a/.gitignore b/.gitignore index c76bf58..0cfd570 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ gnome-applets-2.31.6.tar.bz2 /gnome-applets-3.5.1.tar.xz /gnome-applets-3.5.91.tar.xz /gnome-applets-3.5.92.tar.xz +/gnome-applets-3.14.0.tar.xz diff --git a/gnome-applets-cpupower.patch b/gnome-applets-cpupower.patch index 134a617..ec85059 100644 --- a/gnome-applets-cpupower.patch +++ b/gnome-applets-cpupower.patch @@ -1,6 +1,6 @@ -diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in ---- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400 -+++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400 +diff -up gnome-applets-3.1.90/configure.ac.cpupower gnome-applets-3.1.90/configure.ac +--- gnome-applets-3.1.90/configure.ac.cpupower 2011-08-31 18:49:00.628945807 -0400 ++++ gnome-applets-3.1.90/configure.ac 2011-08-31 18:49:17.397946966 -0400 @@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr LIBCPUFREQ_LIBS= if test "x$have_libcpufreq" = "xyes"; then diff --git a/gnome-applets.spec b/gnome-applets.spec index 4965722..fd01b16 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -1,34 +1,31 @@ -%define glib2_version 2.22.0 +%define glib2_version 2.30.0 %define pango_version 1.2.0 -%define gtk3_version 3.0 -%define gnome_panel_version 2.91.90 +%define gtk3_version 3.2 +%define gnome_panel_version 3.10.0 %define libgtop2_version 2.12.0 -%define gstreamer_version 0.10.14 -%define gstreamer_plugins_version 0.10.14 -%define gstreamer_plugins_good_version 0.10.6 %define libxklavier_version 4.0 %define libwnck_version 2.91.0 %define dbus_version 1.1.2 %define dbus_glib_version 0.74 %define libnotify_version 0.7 %define pygobject_version 2.26 -%define gconf_version 2.14.0 -%define libgweather_version 3.5.0 +%define libgweather_version 3.7.3 +%define upower_version 0.9.4 -%define po_package gnome-applets-2.0 +%define po_package gnome-applets-3.0 -%define build_stickynotes 0 +%define build_stickynotes 1 Summary: Small applications for the GNOME panel Name: gnome-applets -Version: 3.5.92 -Release: 4%{?dist} +Version: 3.14.0 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ and GFDL Group: User Interface/Desktops URL: http://www.gnome.org/ # VCS: git:git://git.gnome.org/gnome-applets -Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz Patch1: gnome-applets-cpupower.patch BuildRequires: glib2-devel >= %{glib2_version} @@ -37,12 +34,10 @@ BuildRequires: gnome-panel-devel >= %{gnome_panel_version} BuildRequires: libgtop2-devel >= %{libgtop2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} -BuildRequires: gstreamer-devel >= %{gstreamer_version} -BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version} -BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_good_version} BuildRequires: libwnck3-devel >= %{libwnck_version} BuildRequires: libnotify-devel >= %{libnotify_version} -BuildRequires: pygobject2-devel >= %{pygobject_version} +BuildRequires: python3-devel +BuildRequires: pygobject3-devel >= %{pygobject_version} BuildRequires: gucharmap-devel BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -51,14 +46,16 @@ BuildRequires: gnome-doc-utils BuildRequires: which BuildRequires: intltool BuildRequires: pkgconfig -BuildRequires: gnome-icon-theme +BuildRequires: gnome-icon-theme-devel BuildRequires: libxslt +BuildRequires: gnome-settings-daemon-devel BuildRequires: NetworkManager-devel BuildRequires: libgweather-devel >= %{libgweather_version} # For cpufreq BuildRequires: dbus-devel BuildRequires: polkit-devel >= 0.92 -BuildRequires: scrollkeeper +BuildRequires: upower-devel >= %{upower_version} +BuildRequires: yelp-tools BuildRequires: libSM-devel %ifnarch s390 s390x sparc64 BuildRequires: kernel-tools-devel @@ -68,14 +65,9 @@ BuildRequires: autoconf automake libtool Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} -Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version} -Requires: gstreamer-plugins-good >= %{gstreamer_plugins_good_version} Requires: dbus >= %{dbus_version} - -Requires(pre): GConf2 >= %{gconf_version} -Requires(preun): GConf2 >= %{gconf_version} -Requires(post): GConf2 >= %{gconf_version} +Requires: python3-gobject Obsoletes: battstat_applet Obsoletes: gnome-cpufreq-applet @@ -94,6 +86,7 @@ autoreconf -i -f %build %configure \ + --libexecdir=%{_libexecdir}/gnome-panel \ --enable-suid=no \ --disable-battstat \ --disable-scrollkeeper \ @@ -108,9 +101,7 @@ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dyn make %{?_smp_mflags} %install -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %find_lang %{po_package} --all-name --with-gnome @@ -123,7 +114,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libgweather.a rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap %if ! %{build_stickynotes} - rm -f $RPM_BUILD_ROOT%{_libexecdir}/stickynotes_applet + rm -f $RPM_BUILD_ROOT%{_libexecdir}/gnome-panel/stickynotes_applet %endif @@ -131,66 +122,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/xmodmap /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/charpick.schemas \ - %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \ - %{_sysconfdir}/gconf/schemas/drivemount.schemas \ - %{_sysconfdir}/gconf/schemas/geyes.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ -%if %{build_stickynotes} - %{_sysconfdir}/gconf/schemas/stickynotes.schemas \ -%endif - %{_sysconfdir}/gconf/schemas/multiload.schemas > /dev/null -%{_libexecdir}/gnome-applets/mc-install-default-macros >& /dev/null || : - -%pre -if [ "$1" -gt 1 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/battstat.schemas \ - %{_sysconfdir}/gconf/schemas/charpick.schemas \ - %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \ - %{_sysconfdir}/gconf/schemas/drivemount.schemas \ - %{_sysconfdir}/gconf/schemas/geyes.schemas \ - %{_sysconfdir}/gconf/schemas/gswitchit.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ -%if %{build_stickynotes} - %{_sysconfdir}/gconf/schemas/stickynotes.schemas \ -%endif - %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || : - if [ -f %{_sysconfdir}/gconf/schemas/battstat.schemas ]; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/battstat.schemas >& /dev/null || : - fi - if [ -f %{_sysconfdir}/gconf/schemas/gweather.schemas ]; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/gweather.schemas >& /dev/null || : - fi - if [ -f %{_sysconfdir}/gconf/schemas/mixer.schemas ]; then - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/mixer.schemas >& /dev/null || : - fi -fi - -%preun -if [ "$1" -eq 0 ]; then - export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` - gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/charpick.schemas \ - %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \ - %{_sysconfdir}/gconf/schemas/drivemount.schemas \ - %{_sysconfdir}/gconf/schemas/geyes.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \ - %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ -%if %{build_stickynotes} - %{_sysconfdir}/gconf/schemas/stickynotes.schemas \ -%endif - %{_sysconfdir}/gconf/schemas/multiload.schemas >& /dev/null || : -fi - %postun /sbin/ldconfig if [ $1 -eq 0 ] ; then @@ -214,34 +145,34 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/* %{_datadir}/gnome-applets %{_bindir}/* -%{python_sitelib}/invest/ -%{_libexecdir}/accessx-status-applet -%{_libexecdir}/charpick_applet2 -%{_libexecdir}/cpufreq-applet -%{_libexecdir}/drivemount_applet2 -%{_libexecdir}/geyes_applet2 -%{_libexecdir}/gnome-applets/ -%{_libexecdir}/gweather-applet-2 -%{_libexecdir}/mini_commander_applet -%{_libexecdir}/multiload-applet-2 -%{_libexecdir}/null_applet - +%{python3_sitelib}/invest/ +%{_libexecdir}/gnome-panel/accessx-status-applet +%{_libexecdir}/gnome-panel/charpick_applet2 +%{_libexecdir}/gnome-panel/cpufreq-applet +%{_libexecdir}/gnome-panel/drivemount_applet2 +%{_libexecdir}/gnome-panel/geyes_applet2 +%{_libexecdir}/gnome-panel/gweather-applet-2 +%{_libexecdir}/gnome-panel/mini_commander_applet +%{_libexecdir}/gnome-panel/modem_applet +%{_libexecdir}/gnome-panel/multiload-applet-2 %if %{build_stickynotes} -%{_libexecdir}/stickynotes_applet +%{_libexecdir}/gnome-panel/stickynotes_applet %endif - -%{_libexecdir}/trashapplet -%{_libexecdir}/invest-applet -%{_sysconfdir}/gconf/schemas/* +%{_libexecdir}/gnome-panel/trashapplet +%{_libexecdir}/gnome-panel/window-picker-applet +%{_libexecdir}/gnome-panel/invest-applet %{_sysconfdir}/dbus-1/system.d/org.gnome.CPUFreqSelector.conf -%{_datadir}/glib-2.0/schemas/org.gnome.applets.GWeatherApplet.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gnome-applets.* %{_datadir}/polkit-1/actions/org.gnome.cpufreqselector.policy %{_datadir}/dbus-1/system-services/org.gnome.CPUFreqSelector.service %{_datadir}/dbus-1/services/* -%{_datadir}/gnome-panel/4.0/applets/* +%{_datadir}/gnome-panel/5.0/applets/* %changelog +* Mon Feb 09 2015 Yaakov Selkowitz - 1:3.14.0-1 +- Version bump for GNOME Flashback 3.14. + * Wed Feb 13 2013 Fedora Release Engineering - 1:3.5.92-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 7e2ab04..8e54eda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e38a776431e648a2932fa5c6ebff40a4 gnome-applets-3.5.92.tar.xz +5c25fc7c8c34b5eafb94e1a02d3589ae gnome-applets-3.14.0.tar.xz -- cgit