diff --git a/.gitignore b/.gitignore index e69de29..b6f169a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cinnamon-settings-daemon-1.0.0.git42cc1ce.tar.gz diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec new file mode 100644 index 0000000..06d06c0 --- /dev/null +++ b/cinnamon-settings-daemon.spec @@ -0,0 +1,258 @@ +%global _internal_version 42cc1ce + +Name: cinnamon-settings-daemon +Version: 1.0.0 +Release: 0.2.git%{_internal_version}%{?dist} +Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications + +Group: System Environment/Daemons +License: GPLv2+ and LGPLv2+ +URL: http://cinnamon.linuxmint.com +# To generate tarball +# wget https://github.com/linuxmint/cinnamon-settings-daemon/tarball/%%{_internal_version} -O cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz +Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.git%{_internal_version}.tar.gz +Patch0: %{name}_gnome_3.9.patch + +Requires: control-center-filesystem +Requires: hicolor-icon-theme + +BuildRequires: dbus-glib-devel +BuildRequires: gtk3-devel >= 2.99.3 +BuildRequires: gnome-desktop3-devel >= 3.1.4 +BuildRequires: xorg-x11-proto-devel libXxf86misc-devel +BuildRequires: gstreamer-devel +BuildRequires: gstreamer-plugins-base-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libgnomekbd-devel +BuildRequires: libnotify-devel +BuildRequires: gettext intltool +BuildRequires: fontconfig-devel +BuildRequires: libcanberra-devel +BuildRequires: polkit-devel +BuildRequires: gnome-common +BuildRequires: libxklavier-devel +BuildRequires: PackageKit-glib-devel +BuildRequires: cups-devel +BuildRequires: upower-devel +BuildRequires: libgudev1-devel +BuildRequires: nss-devel +BuildRequires: colord-devel >= 0.1.12 +BuildRequires: lcms2-devel >= 2.2 +BuildRequires: libXi-devel libXfixes-devel +BuildRequires: systemd-devel +BuildRequires: libXtst-devel +BuildRequires: libxkbfile-devel +BuildRequires: ibus-devel +BuildRequires: libxslt +BuildRequires: docbook-style-xsl +BuildRequires: libwacom-devel +BuildRequires: xorg-x11-drv-wacom-devel + +%description +A daemon to share settings from CINNAMON to other applications. It also +handles global keybindings, and many of desktop-wide settings. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +Requires: dbus-glib-devel + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%package updates +Summary: Updates plugin for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + + +%description updates +This package contains the updates plugin for %{name} + +%prep +%setup -q -n linuxmint-cinnamon-settings-daemon-%{_internal_version} +%patch0 -p1 +NOCONFIGURE=1 ./autogen.sh + +%build +%configure --disable-static \ + --enable-profiling \ + --enable-packagekit \ + --enable-systemd +make V=1 %{?_smp_mflags} + + +%install +%make_install +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +%find_lang %{name} --with-gnome + + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ]; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + +%postun updates +if [ $1 -eq 0 ]; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : +fi + +%posttrans updates +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : + +%files -f %{name}.lang +%doc AUTHORS COPYING +%dir %{_sysconfdir}/cinnamon-settings-daemon +%dir %{_sysconfdir}/cinnamon-settings-daemon/xrandr + +# list plugins explicitly, so we notice if one goes missing +# some of these don't have a separate gschema +%dir %{_libdir}/cinnamon-settings-daemon-3.0 +%{_libdir}/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/liba11y-keyboard.so + +# The automount plugin is a separate executable used in fallback +# mode only +%{_libexecdir}/cinnamon-fallback-mount-helper +%config %{_sysconfdir}/xdg/autostart/cinnamon-fallback-mount-helper.desktop + +%{_libdir}/cinnamon-settings-daemon-3.0/background.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libbackground.so + +%{_libdir}/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libclipboard.so + +%{_libexecdir}/csd-datetime-mechanism +%config %{_sysconfdir}/dbus-1/system.d/org.cinnamon.SettingsDaemon.DateTimeMechanism.conf +%{_datadir}/dbus-1/system-services/org.cinnamon.SettingsDaemon.DateTimeMechanism.service +%{_datadir}/polkit-1/actions/org.cinnamon.settingsdaemon.datetimemechanism.policy + +%{_libdir}/cinnamon-settings-daemon-3.0/housekeeping.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libhousekeeping.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.housekeeping.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/keyboard.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libkeyboard.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.keyboard.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/media-keys.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libmedia-keys.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.media-keys.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/mouse.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libmouse.so + +%{_libexecdir}/csd-backlight-helper +%{_datadir}/polkit-1/actions/org.cinnamon.settings-daemon.plugins.power.policy +%{_libdir}/cinnamon-settings-daemon-3.0/power.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libpower.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.power.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/print-notifications.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libprint-notifications.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.print-notifications.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/smartcard.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libsmartcard.so + +%{_libdir}/cinnamon-settings-daemon-3.0/sound.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libsound.so + +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.peripherals.gschema.xml +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml +%{_libdir}/cinnamon-settings-daemon-3.0/wacom.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libcsdwacom.so +%{_libexecdir}/csd-wacom-led-helper +%{_datadir}/polkit-1/actions/org.cinnamon.settings-daemon.plugins.wacom.policy + + +%{_libdir}/cinnamon-settings-daemon-3.0/xrandr.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libxrandr.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/xsettings.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libxsettings.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/liba11y-settings.so + +%{_libdir}/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libcolor.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.color.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/liborientation.so +%{_libdir}/cinnamon-settings-daemon-3.0/orientation.cinnamon-settings-plugin +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.orientation.gschema.xml + +%{_libdir}/cinnamon-settings-daemon-3.0/libcursor.so +%{_libdir}/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin + +%{_libdir}/cinnamon-settings-daemon-3.0/libscreensaver-proxy.so +%{_libdir}/cinnamon-settings-daemon-3.0/screensaver-proxy.cinnamon-settings-plugin + +%{_libdir}/cinnamon-settings-daemon-3.0/libcsd.so + +%{_libexecdir}/cinnamon-settings-daemon +%{_libexecdir}/csd-locate-pointer +%{_libexecdir}/csd-printer + +%{_datadir}/cinnamon-settings-daemon/ +%config %{_sysconfdir}/xdg/autostart/cinnamon-settings-daemon.desktop +%{_datadir}/icons/hicolor/*/apps/csd-xrandr.* + +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.enums.xml +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.gschema.xml + +%{_datadir}/man/man1/cinnamon-settings-daemon.1.* + + +%files devel +%{_includedir}/cinnamon-settings-daemon-3.0/ +%{_libdir}/pkgconfig/cinnamon-settings-daemon.pc +%{_datadir}/cinnamon-settings-daemon-3.0/ +%{_libexecdir}/csd-list-wacom +%{_libexecdir}/csd-test-wacom +%{_libexecdir}/csd-test-a11y-keyboard +%{_libexecdir}/csd-test-a11y-settings +%{_libexecdir}/csd-test-background +%{_libexecdir}/csd-test-input-helper +%{_libexecdir}/csd-test-media-keys +%{_libexecdir}/csd-test-mouse +%{_libexecdir}/csd-test-orientation +%{_libexecdir}/csd-test-power +%{_libexecdir}/csd-test-print-notifications +%{_libexecdir}/csd-test-screensaver-proxy +%{_libexecdir}/csd-test-smartcard +%{_libexecdir}/csd-test-sound +%{_libexecdir}/csd-test-xsettings + +%files updates +%{_libdir}/cinnamon-settings-daemon-3.0/updates.cinnamon-settings-plugin +%{_libdir}/cinnamon-settings-daemon-3.0/libupdates.so +%{_datadir}/glib-2.0/schemas/org.cinnamon.settings-daemon.plugins.updates.gschema.xml +%{_datadir}/dbus-1/interfaces/org.cinnamon.SettingsDaemonUpdates.xml + +%changelog +* Thu Jul 18 2013 Leigh Scott - 1.0.0-0.2.git42cc1ce +- add %%config to files +- fix directory ownership on %%{_libdir}/cinnamon-settings-daemon-3.0 +- remove dead bits from spec file + +* Sat May 25 2013 Leigh Scott - 1.0.0-0.1.git42cc1ce +- Initial build + diff --git a/cinnamon-settings-daemon_gnome_3.9.patch b/cinnamon-settings-daemon_gnome_3.9.patch new file mode 100644 index 0000000..a0e7aef --- /dev/null +++ b/cinnamon-settings-daemon_gnome_3.9.patch @@ -0,0 +1,78 @@ +--- a/plugins/color/csd-color-manager.c ++++ b/plugins/color/csd-color-manager.c +@@ -1014,7 +1014,7 @@ gcm_session_use_output_profile_for_scree + connected = outputs[i]; + if (gnome_rr_output_get_is_primary (outputs[i])) + has_primary = TRUE; +- if (gnome_rr_output_is_laptop (outputs[i])) ++ if (gnome_rr_output_is_builtin_display (outputs[i])) + has_laptop = TRUE; + } + +@@ -1024,7 +1024,7 @@ gcm_session_use_output_profile_for_scree + + /* choosing the internal panel is probably sane */ + if (has_laptop) +- return gnome_rr_output_is_laptop (output); ++ return gnome_rr_output_is_builtin_display (output); + + /* we have to choose one, so go for the first connected device */ + if (connected != NULL) +@@ -1123,7 +1123,7 @@ gcm_session_device_assign_profile_connec + * calibration brightness then set this new brightness */ + brightness_profile = cd_profile_get_metadata_item (profile, + CD_PROFILE_METADATA_SCREEN_BRIGHTNESS); +- if (gnome_rr_output_is_laptop (output) && ++ if (gnome_rr_output_is_builtin_display (output) && + brightness_profile != NULL) { + /* the percentage is stored in the profile metadata as + * a string, not ideal, but it's all we have... */ +@@ -1384,7 +1384,7 @@ gcm_session_add_x11_output (CsdColorMana + } + + /* prefer DMI data for the internal output */ +- ret = gnome_rr_output_is_laptop (output); ++ ret = gnome_rr_output_is_builtin_display (output); + if (ret) { + model = gcm_dmi_get_name (priv->dmi); + vendor = gcm_dmi_get_vendor (priv->dmi); +@@ -1443,7 +1443,7 @@ gcm_session_add_x11_output (CsdColorMana + #if CD_CHECK_VERSION(0,1,27) + /* set this so we can call the device a 'Laptop Screen' in the + * control center main panel */ +- if (gnome_rr_output_is_laptop (output)) { ++ if (gnome_rr_output_is_builtin_display (output)) { + g_hash_table_insert (device_props, + (gpointer) CD_DEVICE_PROPERTY_EMBEDDED, + NULL); +--- a/plugins/power/csd-power-manager.c ++++ b/plugins/power/csd-power-manager.c +@@ -2234,7 +2234,7 @@ non_laptop_outputs_are_all_off (GnomeRRS + + outputs = gnome_rr_screen_list_outputs (screen); + for (i = 0; outputs[i] != NULL; i++) { +- if (gnome_rr_output_is_laptop (outputs[i])) ++ if (gnome_rr_output_is_builtin_display (outputs[i])) + continue; + + if (is_on (outputs[i])) +@@ -2432,7 +2432,7 @@ get_primary_output (CsdPowerManager *man + + for (i = 0; outputs[i] != NULL; i++) { + if (gnome_rr_output_is_connected (outputs[i]) && +- gnome_rr_output_is_laptop (outputs[i]) && ++ gnome_rr_output_is_builtin_display (outputs[i]) && + gnome_rr_output_get_backlight_min (outputs[i]) >= 0 && + gnome_rr_output_get_backlight_max (outputs[i]) > 0) { + output = outputs[i]; +--- a/plugins/xrandr/csd-xrandr-manager.c ++++ b/plugins/xrandr/csd-xrandr-manager.c +@@ -372,7 +372,7 @@ is_laptop (GnomeRRScreen *screen, GnomeR + + rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output)); + +- return gnome_rr_output_is_laptop (rr_output); ++ return gnome_rr_output_is_builtin_display (rr_output); + } + + static GnomeRROutputInfo * diff --git a/sources b/sources index e69de29..a17c44b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e0156dbb3f4675305ce84f5ccde04b98 cinnamon-settings-daemon-1.0.0.git42cc1ce.tar.gz