[cinnamon] Update to 1.8.2 release
Dan Mashal
vicodan at fedoraproject.org
Thu May 9 03:53:28 UTC 2013
commit 8d7a862679bab698a5d2db713a8abc7466b60b5d
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Wed May 8 20:53:18 2013 -0700
Update to 1.8.2 release
.gitignore | 1 +
cinnamon.spec | 264 ++++++++++++++++-----------------------------------------
sources | 2 +-
3 files changed, 74 insertions(+), 193 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f49ef6..743ce50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/cinnamon-1.6.6.tar.gz
/cinnamon-1.6.7.tar.gz
+/cinnamon-1.8.2.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 1963521..5d6e3f6 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,66 +1,31 @@
-%global _internal_version 5ab432d
-
-%{?filter_setup:
-%filter_from_provides /^libcinnamon.so/d;
-%filter_from_requires /^libcinnamon.so/d;
-%filter_setup
-}
-
Name: cinnamon
-Version: 1.6.7
-Release: 7%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
Summary: Window management and application launching for GNOME
-
-Group: User Interface/Desktops
-# cinnamon-menu-editor is LGPLv2+
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
-# To generate tarball
-# wget https://github.com/linuxmint/Cinnamon/tarball/%%{_internal_version} -O cinnamon-%%{version}.git%%{_internal_version}.tar.gz
-Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon/source/cinnamon-%{version}.tar.gz
-Source1: cinnamon.desktop
-Source2: cinnamon.session
-Source3: cinnamon2d.desktop
-Source4: cinnamon2d.session
-Source5: cinnamon-screensaver.desktop
-Source6: cinnamon2d-screensaver.desktop
-
-
-# Fix menu structure
-Patch0: cinnamon-1.4.1_menu.patch
-Patch1: cinnamon-1.5.0_datetime_setting.patch
-# Replace mint favorites with fedora gnome-shell defaults
-Patch2: cinnamon-1.6.0_favourite-apps-firefox.patch
-Patch3: fedora_icon.patch
-Patch4: cinnamon.css.patch
-Patch5: keyboard_applet.patch
-Patch6: cinnamon_menu_applet.patch
-# upstream patches and pending pulls
-
-# https://github.com/linuxmint/Cinnamon/pull/1612
-Patch7: cinnamon-pillow.patch
-
-
-%global clutter_version 1.10.1
-%global gobject_introspection_version 0.10.1
-%global muffin_version 1.1.0
-%global eds_version 2.91.6
-%global json_glib_version 0.13.2
-
-
-BuildRequires: clutter-devel >= %{clutter_version}
+#Because linuxmint upstream refuses to host pristine upstream tarballs
+Source0: http://vicodan.fedorapeople.org/%{name}-%{version}.tar.gz
+#mtwebster's cinnamon repo with gnome 3.8 fixes
+#wget https://github.com/mtwebster/Cinnamon/archive/gnome-3.8-compat.zip
+
+
+BuildRequires: clutter-devel
+BuildRequires: clutter-gst-devel
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-BuildRequires: gjs-devel >= 0.7.14-6
+BuildRequires: folks-devel
+BuildRequires: gjs-devel
BuildRequires: glib2-devel
BuildRequires: GConf2-devel
-BuildRequires: gnome-menus-devel >= 3.1.5-2.fc16
+BuildRequires: gnome-menus-devel
BuildRequires: gnome-desktop3-devel
-BuildRequires: gobject-introspection >= %{gobject_introspection_version}
-BuildRequires: json-glib-devel >= %{json_glib_version}
+BuildRequires: gobject-introspection-devel
+BuildRequires: json-glib-devel
BuildRequires: upower-devel
BuildRequires: NetworkManager-glib-devel
BuildRequires: polkit-devel
+BuildRequires: telepathy-logger-devel
BuildRequires: libgudev1-devel
# for screencast recorder functionality
BuildRequires: gstreamer-devel
@@ -70,13 +35,11 @@ BuildRequires: libcanberra-devel
BuildRequires: libcroco-devel
BuildRequires: libgnome-keyring-devel
BuildRequires: libsoup-devel
-
-
-# for barriers
+BuildRequires: pkgconfig(libnm-glib)
BuildRequires: libXfixes-devel >= 5.0
# used in unused BigThemeImage
BuildRequires: librsvg2-devel
-BuildRequires: muffin-devel >= %{muffin_version}
+BuildRequires: muffin-devel
BuildRequires: pulseaudio-libs-devel
%ifnarch s390 s390x
BuildRequires: gnome-bluetooth-libs-devel >= 2.91
@@ -92,8 +55,6 @@ Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version
Requires: librsvg2%{?_isa}
# needed as it is now split from Clutter
Requires: json-glib%{?_isa} >= %{json_glib_version}
-# might be still be needed.
-Requires: muffin%{?_isa} >= %{muffin_version}
Requires: upower%{?_isa}
Requires: polkit%{?_isa} >= 0.100
# needed for session files
@@ -104,8 +65,11 @@ Requires: at-spi2-atk%{?_isa}
Requires: caribou%{?_isa}
# needed for the user menu
Requires: accountsservice-libs
-Requires: %{name}-settings = %{version}-%{release}
-
+Requires: muffin >= 1.8.0-1
+Obsoletes: cinnamon-2d
+Obsoletes: cinnamon-settings
+Obsoletes: cinnamon-menu-editor
+Obsoletes: cinnamon <= 1.8.0-1
%description
Cinnamon is a Linux desktop which provides advanced
@@ -116,101 +80,19 @@ The underlying technology is forked from Gnome Shell.
The emphasis is put on making users feel at home and providing
them with an easy to use and comfortable desktop experience.
-%package 2d
-Summary: Browser plugins for the Cinnamon Desktop
-Group: User Interface/Desktops
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-
-%description 2d
-The Cinnamon Desktop provides advanced innovative features and a traditional
-user experience. The underlying technology is forked from gnome-shell and the
-desktop layout is closer to GNOME2. The emphasis is put on making users look
-and feel at home and provide them an easy to use and confortable experience.
-
-%package settings
-Summary: Settings GUI for Cinnamon
-Group: Applications/System
-BuildArch: noarch
-# needed for settings
-Requires: pygobject2
-Requires: dbus-python
-Requires: python-lxml
-Requires: gnome-python2-gconf
-Requires: python-imaging
-
-%description settings
-The Cinnamon Desktop provides advanced innovative features and a traditional
-user experience. The underlying technology is forked from gnome-shell and the
-desktop layout is closer to GNOME2. The emphasis is put on making users look
-and feel at home and provide them an easy to use and confortable experience.
-
-%package menu-editor
-Summary: Menu editor for Cinnamon based on Alacarte
-Group: Applications/System
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-# needed for cinnamon-menu
-# https://bugzilla.redhat.com/show_bug.cgi?id=872694
-Requires: gnome-panel
-
-%description menu-editor
-The Cinnamon Desktop provides advanced innovative features and a traditional
-user experience. The underlying technology is forked from gnome-shell and the
-desktop layout is closer to GNOME2. The emphasis is put on making users look
-and feel at home and provide them an easy to use and confortable experience.
-
-
%prep
-%setup -q -n linuxmint-Cinnamon-%{_internal_version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-# keyboard applet patch
-# https://github.com/linuxmint/Cinnamon/issues/1337#issuecomment-10342075
-%if 0%{?fedora} > 17
-%patch5 -p1
-%endif
-
-%patch6 -p1
-
-# upstream patches and pending pulls
-%patch7 -p1
-
-
-# remove gschema
-rm -rf data/org.cinnamon.gschema.xml
-# make changes for settings move to /usr/share
-mv files/usr/lib/cinnamon-settings files%{_datadir}
-sed -i -e 's@/usr/lib@/usr/share at g' files%{_bindir}/cinnamon-settings \
- files%{_datadir}/cinnamon-settings/cinnamon-settings.py \
- js/ui/panel.js cinnamon.pot
-# make changes for menu-editor move to /usr/share
-mv files/usr/lib/cinnamon-menu-editor files%{_datadir}
-rm -rf files/usr/lib
-sed -i -e 's@/usr/lib@/usr/share at g' files%{_bindir}/cinnamon-menu-editor \
- files%{_datadir}/cinnamon-menu-editor/Alacarte/MainWindow.py
-sed -i -e 's at -OOt@-t at g' files%{_bindir}/cinnamon-menu-editor
-# remove and replace the session files as they don't work with fedora (can't be bothered to patch it)
-rm -f files%{_bindir}/gnome-session-cinnamon \
- files%{_datadir}/xsessions/cinnamon*.desktop \
- files%{_datadir}/gnome-session/sessions/cinnamon*.session
-install -pm 644 %SOURCE1 %SOURCE3 files%{_datadir}/xsessions/
-install -pm 644 %SOURCE2 %SOURCE4 files%{_datadir}/gnome-session/sessions/
-# files replaced with fedora files
-rm -f files%{_datadir}/desktop-directories/cinnamon-{menu-applications,utility,utility-accessibility,development,education,game,graphics,network,audio-video,office,system-tools,other}.directory
-
-rm -f configure
-rm -rf debian/
+%setup -q
NOCONFIGURE=1 ./autogen.sh
%build
-export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
-%configure --disable-static --enable-compile-warnings=yes
-make V=1 %{?_smp_mflags}
+%configure --disable-static \
+ --disable-rpath \
+ --disable-schemas-compile \
+ --enable-introspection=yes \
+ --enable-compile-warnings=no
+
+
+make %{?_smp_mflags} V=1
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
@@ -221,12 +103,6 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/cinnamon/libcinnamon.la
# Remove firefox plugin
rm -rf $RPM_BUILD_ROOT/%{_libdir}/mozilla
-# Add autostart files for gnome-screensaver
-%if 0%{?fedora} > 17
-mkdir $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/autostart/
-install -pm 0644 %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
-%endif
-
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon2d.desktop
@@ -253,52 +129,56 @@ fi
%files -f %{name}.lang
%doc COPYING README
%{_bindir}/cinnamon
-%exclude %{_bindir}/cinnamon-launcher
-%{_bindir}/cinnamon-extension-tool
-%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
-%if 0%{?fedora} > 17
-%{_sysconfdir}/xdg/autostart/cinnamon*-screensaver.desktop
-%endif
-%{_datadir}/desktop-directories/cinnamon-*.directory
-%{_datadir}/glib-2.0/schemas/*.xml
-%{_datadir}/applications/cinnamon.desktop
-%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
-%{_datadir}/xsessions/cinnamon.desktop
-%{_datadir}/gnome-session/sessions/cinnamon.session
-%{_datadir}/cinnamon/
-%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
-%{_libdir}/cinnamon/
-%{_libexecdir}/cinnamon/cinnamon-perf-helper
-%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
-%{_mandir}/man1/cinnamon.1.*
-%{_mandir}/man1/cinnamon-extension-tool.1.*
-%{_mandir}/man1/cinnamon-launcher.1.*
-%{_mandir}/man1/gnome-session-cinnamon.1.*
-
-%files settings
-%{_sysconfdir}/xdg/menus/cinnamon-settings.menu
+%{_bindir}/cinnamon3d
+%{_mandir}/man1/*
%{_bindir}/cinnamon-settings
-%{_datadir}/cinnamon-settings/
%{_datadir}/applications/cinnamon-settings.desktop
-%{_mandir}/man1/cinnamon-settings.1.*
-
-%files menu-editor
%{_bindir}/cinnamon-menu-editor
-%{_datadir}/cinnamon-menu-editor/
%{_datadir}/applications/cinnamon-menu-editor.desktop
-%{_mandir}/man1/cinnamon-menu-editor.1.*
-
-%files 2d
%{_bindir}/cinnamon2d
%{_bindir}/gnome-session-cinnamon2d
%{_datadir}/applications/cinnamon2d.desktop
%{_datadir}/gnome-session/sessions/cinnamon2d.session
+%{_sysconfdir}/xdg/menus/cinnamon-applications-merged
+%{_sysconfdir}/xdg/menus/cinnamon-applications.menu
+%{_bindir}/cinnamon-extension-tool
+%{_bindir}/cinnamon-launcher
+%{_bindir}/cinnamon-looking-glass
+%{_bindir}/cinnamon-screensaver-lock-dialog
+%{_bindir}/gnome-session-cinnamon
+%{_datadir}/cinnamon/applets
+%{_datadir}/cinnamon/bumpmaps
+%{_datadir}/cinnamon/desklets
+%{_datadir}/cinnamon/icons/move-symbolic.svg
+%{_datadir}/cinnamon/js
+%{_datadir}/cinnamon/search_providers
+%{_datadir}/cinnamon/shaders
+%{_datadir}/cinnamon/theme
+%{_libdir}/cinnamon/Cinnamon-0.1.typelib
+%{_libdir}/cinnamon/Gvc-1.0.typelib
+%{_libdir}/cinnamon/St-1.0.typelib
+%{_libdir}/cinnamon/libcinnamon.so
+%{_libexecdir}/cinnamon/cinnamon-hotplug-sniffer
+%{_libexecdir}/cinnamon/cinnamon-perf-helper
+%{_datadir}/applications/cinnamon-add-panel-launcher.desktop
+%{_datadir}/applications/cinnamon.desktop
+%{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml
+%{_datadir}/gnome-session/sessions/cinnamon.session
+%{_datadir}/xsessions/cinnamon.desktop
%{_datadir}/xsessions/cinnamon2d.desktop
-%{_mandir}/man1/gnome-session-cinnamon2d.1.*
-%{_mandir}/man1/cinnamon2d.1.*
-
+%{_datadir}/desktop-directories
+#No choice but to do this. Filing a bug with upstream on this.
+%{_prefix}/lib/cinnamon*/
+%{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
%changelog
+* Wed May 08 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.8.2-1
+- Initial build of 1.8.2
+- Fix erroneous changelog date
+- Fix gnome 3.8 compatability
+- Fix RHBZ 920320 and probably some others
+- Get rid of split subpackages (for sanity)
+
* Fri Feb 22 2013 Kalev Lember <kalevlember at gmail.com> - 1.6.7-7
- Rebuilt for cogl soname bump
@@ -476,7 +356,7 @@ fi
* Fri Feb 17 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.3.0-1
- update to 1.3.0 release
-* Mon Jan 22 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.2.0-1
+* Sun Jan 22 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.2.0-1
- update to 1.2.0 release
- add build requires muffin-devel
- add Br libgudev1-devel
diff --git a/sources b/sources
index 5354a76..9313f36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea73c6367d43d82c61f977477bf0c08c cinnamon-1.6.7.tar.gz
+9cca102a9949bed93bc5b963456d1666 cinnamon-1.8.2.tar.gz
More information about the scm-commits
mailing list