|
@@ -1,7 +1,7 @@
|
|
|
Name: cinnamon
|
|
|
Summary: A Linux Desktop featuring a traditional layout and modern technology
|
|
|
-Version: 1.8.8.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.2.3
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: User Interface/Desktops
|
|
|
License: GPLv2+
|
|
@@ -11,18 +11,14 @@ Source0: Cinnamon-%{version}.tar.gz
|
|
|
|
|
|
# patch from alt
|
|
|
# http://git.altlinux.org/people/cow/packages/?p=cinnamon.git;a=summary
|
|
|
-Patch0: cinnamon-1.7.6-gjs-1.0.patch
|
|
|
-Patch1: cinnamon-1.7.6-clutter_disable_xinput.patch
|
|
|
-
|
|
|
-Patch2: cinnamon-1.8.8.1-gjs-1.38.x.patch
|
|
|
|
|
|
# vine patch
|
|
|
Patch101: cinnamon-vine-settings.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-BuildRequires: muffin-devel >= 1.1.2
|
|
|
-BuildRequires: gjs-devel >= 1.29.18
|
|
|
+BuildRequires: muffin-devel >= 1.9.1
|
|
|
+BuildRequires: cjs-devel >= 1.9.0
|
|
|
BuildRequires: gstreamer-plugins-base-devel >= 0.10.16
|
|
|
BuildRequires: folks-devel >= 0.5.2
|
|
|
BuildRequires: evolution-data-server-devel >= 2.32.0
|
|
@@ -30,11 +26,11 @@ BuildRequires: telepathy-glib-devel >= 0.15.5
|
|
|
BuildRequires: telepathy-logger-devel >= 0.2.4
|
|
|
BuildRequires: polkit-devel >= 0.100
|
|
|
BuildRequires: startup-notification-devel >= 0.11
|
|
|
-BuildRequires: gnome-menus-devel
|
|
|
+BuildRequires: cinnamon-menus-devel
|
|
|
BuildRequires: NetworkManager-glib-devel
|
|
|
BuildRequires: libgnome-keyring-devel
|
|
|
BuildRequires: libcroco-devel >= 0.6.2
|
|
|
-BuildRequires: gnome-desktop3-devel >= 2.90.0
|
|
|
+BuildRequires: cinnamon-desktop-devel
|
|
|
BuildRequires: pulseaudio-libs-devel
|
|
|
BuildRequires: libgudev1-devel
|
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
@@ -45,9 +41,17 @@ BuildRequires: gnome-common
|
|
|
Requires(postun,posttrans): glib2
|
|
|
Requires(postun,posttrans): desktop-file-utils
|
|
|
Requires: muffin
|
|
|
+Requires: cinnamon-session
|
|
|
+Requires: cinnamon-menus
|
|
|
Requires: python-imaging
|
|
|
+Requires: python-pam
|
|
|
+Requires: python-pexpect
|
|
|
Requires: ca-certificates
|
|
|
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Packager: Takemikaduchi
|
|
|
+
|
|
|
%description
|
|
|
Cinnamon is a Linux desktop which provides advanced innovative features and a traditional user experience.
|
|
|
|
|
@@ -57,11 +61,11 @@ The emphasis is put on making users feel at home and providing them with an easy
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n Cinnamon-%{version}
|
|
|
-%patch0 -p1
|
|
|
-%patch1 -p1
|
|
|
-%patch2 -p1 -b .gjs
|
|
|
%patch101 -p1 -b .vine
|
|
|
|
|
|
+# fix PAM module
|
|
|
+sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
|
|
|
+
|
|
|
%build
|
|
|
NOCONFIGURE=1 ./autogen.sh
|
|
|
%configure \
|
|
@@ -76,7 +80,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
|
|
|
-%find_lang %{name}
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
@@ -98,41 +101,71 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
|
|
|
update-desktop-database -q &> /dev/null || :
|
|
|
|
|
|
|
|
|
-
|
|
|
-%files -f %{name}.lang
|
|
|
+%files
|
|
|
%defattr(-,root,root)
|
|
|
%doc README NEWS COPYING AUTHORS
|
|
|
%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
|
|
|
%{_sysconfdir}/xdg/menus/cinnamon-applications-merged
|
|
|
%{_bindir}/cinnamon
|
|
|
+%{_bindir}/cinnamon-desktop-editor
|
|
|
%{_bindir}/cinnamon-extension-tool
|
|
|
+%{_bindir}/cinnamon-json-makepot
|
|
|
%{_bindir}/cinnamon-launcher
|
|
|
%{_bindir}/cinnamon-looking-glass
|
|
|
%{_bindir}/cinnamon-menu-editor
|
|
|
%{_bindir}/cinnamon-screensaver-lock-dialog
|
|
|
%{_bindir}/cinnamon-settings
|
|
|
+%{_bindir}/cinnamon-session-cinnamon
|
|
|
+%{_bindir}/cinnamon-session-cinnamon2d
|
|
|
+%{_bindir}/cinnamon-settings-users
|
|
|
%{_bindir}/cinnamon2d
|
|
|
-%{_bindir}/gnome-session-cinnamon
|
|
|
-%{_bindir}/gnome-session-cinnamon2d
|
|
|
+%{_prefix}/lib/cinnamon-desktop-editor
|
|
|
+%{_prefix}/lib/cinnamon-json-makepot
|
|
|
%{_prefix}/lib/cinnamon-looking-glass
|
|
|
%{_prefix}/lib/cinnamon-menu-editor
|
|
|
%{_prefix}/lib/cinnamon-screensaver-lock-dialog
|
|
|
%{_prefix}/lib/cinnamon-settings
|
|
|
+%{_prefix}/lib/cinnamon-settings-users
|
|
|
%{_libdir}/%{name}/Cinnamon-0.1.typelib
|
|
|
%{_libdir}/%{name}/Gvc-1.0.typelib
|
|
|
%{_libdir}/%{name}/St-1.0.typelib
|
|
|
%{_libdir}/%{name}/libcinnamon.so
|
|
|
-%{_libdir}/mozilla/plugins/libcinnamon-browser-plugin.so
|
|
|
%{_libexecdir}/%{name}/cinnamon-hotplug-sniffer
|
|
|
%{_libexecdir}/%{name}/cinnamon-perf-helper
|
|
|
%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
|
|
|
%{_datadir}/applications/cinnamon-menu-editor.desktop
|
|
|
%{_datadir}/applications/cinnamon-settings.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-applets.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-backgrounds.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-calendar.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-default.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-desklets.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-desktop.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-effects.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-extensions.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-fonts.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-general.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-hotcorner.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-info.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-keyboard.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-mouse.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-panel.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-power.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-screensaver.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-themes.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-tiling.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-user.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-users.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-windows.desktop
|
|
|
+%{_datadir}/applications/cinnamon-settings-workspaces.desktop
|
|
|
%{_datadir}/applications/cinnamon.desktop
|
|
|
%{_datadir}/applications/cinnamon2d.desktop
|
|
|
+%{_datadir}/cinnamon-session/sessions/cinnamon.session
|
|
|
+%{_datadir}/cinnamon-session/sessions/cinnamon2d.session
|
|
|
%{_datadir}/%{name}/applets
|
|
|
%{_datadir}/%{name}/bumpmaps
|
|
|
%{_datadir}/%{name}/desklets
|
|
|
+%{_datadir}/%{name}/faces
|
|
|
%{_datadir}/%{name}/icons
|
|
|
%{_datadir}/%{name}/js
|
|
|
%{_datadir}/%{name}/search_providers
|
|
@@ -141,13 +174,20 @@ update-desktop-database -q &> /dev/null || :
|
|
|
%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
|
|
|
%{_datadir}/desktop-directories
|
|
|
%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
|
|
|
-%{_datadir}/gnome-session/sessions/cinnamon.session
|
|
|
-%{_datadir}/gnome-session/sessions/cinnamon2d.session
|
|
|
+%{_datadir}/icons/hicolor/*/*/*
|
|
|
+%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy
|
|
|
%{_datadir}/xsessions/cinnamon.desktop
|
|
|
%{_datadir}/xsessions/cinnamon2d.desktop
|
|
|
%{_mandir}/man1/*.1.gz
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Sun Apr 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.2.3-1
|
|
|
+- new upstream release
|
|
|
+- remove Patch0 (cinnamon-1.7.6-gjs-1.0.patch)
|
|
|
+- remove Patch1 (cinnamon-1.7.6-clutter_disable_xinput.patch)
|
|
|
+- remove Patch2 (cinnamon-1.8.8.1-gjs-1.38.x.patch)
|
|
|
+
|
|
|
* Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.8.1-2
|
|
|
- rebuild with cogl-1.16.0
|
|
|
- add Patch2 (cinnamon-1.8.8.1-gjs-1.38.x.patch)
|