[cinnamon] use autosetup for prep
leigh123linux
leigh123linux at fedoraproject.org
Wed Jan 22 18:19:43 UTC 2014
commit 8bc5f5e7ce62bfe8d8e867c9e02573aa754cc212
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Wed Jan 22 18:19:35 2014 +0000
use autosetup for prep
cinnamon.spec | 275 +++------------------------------------------------------
1 files changed, 13 insertions(+), 262 deletions(-)
---
diff --git a/cinnamon.spec b/cinnamon.spec
index 2715f75..bd03e5e 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
Name: cinnamon
Version: 2.0.14
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Window management and application launching for GNOME
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -23,10 +23,16 @@ Patch2: replace_gksu.patch
Patch3: cinnamon-settings-apps.patch
Patch4: keyboard_applet.patch
Patch5: input_keybindings.patch
+%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 20)
Patch6: bluetooth.patch
+%endif
Patch7: compile_fix.patch
+%if 0%{?fedora} > 20
Patch8: upower_calender_fix.patch
+%endif
+%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} > 19)
Patch9: remove_bluetootoh.patch
+%endif
%global clutter_version 1.12.2
%global cjs_version 1.9.1
@@ -149,23 +155,8 @@ The emphasis is put on making users feel at home and providing
them with an easy to use and comfortable desktop experience.
%prep
-%setup -q -n Cinnamon-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 20)
-%patch6 -p1
-%endif
-%patch7 -p1
-%if 0%{?fedora} > 20
-%patch8 -p1
-%endif
-%if (0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} > 19)
-%patch9 -p1
-%endif
+%autosetup -p1 -n Cinnamon-%{version}
+
NOCONFIGURE=1 ./autogen.sh
%build
@@ -249,6 +240,10 @@ fi
%{_mandir}/man1/*
%changelog
+* Wed Jan 22 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-10
+- use autosetup for prep
+- trim spec file changelog
+
* Tue Jan 14 2014 Leigh Scott <leigh123linux at googlemail.com> - 2.0.14-9
- change pexpect requires for epel7
@@ -507,247 +502,3 @@ fi
* Sat Jun 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.7-2
- Re-add build requires versions
-* Sat Jun 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.7-1
-- Update to version 1.8.7
-- drop spice patch (now upstream)
-- fix directory ownership and clenup files section
-
-* Fri May 31 2013 leigh scott <leigh123linux at googlemail.com> - 1.8.6-2
-- patch to fix spice download crash (bz 969162)
-
-* Thu May 30 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.6-1
-- Update to version 1.8.6
-- patch to fix brightness applet (bz 967993)
-
-* Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.5-3
-- rebuild with release source and patch instead
-
-* Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.5-2
-- rebuild with new source
-
-* Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.5-1
-- Update to version 1.8.5
-
-* Mon May 20 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.3-1
-- Update to version 1.8.3
-- drop telepathy and folks build requires
-- Tidy up patches and drop merged patch
-
-* Sun May 12 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.2-4
-- fix missing backgrounds from cinnamon-settings
-
-* Thu May 09 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.2-3
-- fix notifications
-
-* Thu May 09 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.2-2
-- add missing requires for settings
-
-* 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
-
-* Wed Feb 20 2013 Kalev Lember <kalevlember at gmail.com> - 1.6.7-6
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Feb 4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.6.7-5
-- Add patch that's been accepted upstream for pillow support
-
-* Fri Jan 25 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.6.7-4
-- Rebuild for new cogl
-
-* Thu Dec 20 2012 Kalev Lember <kalevlember at gmail.com> - 1.6.7-3
-- Rebuilt for libgnome-desktop3 3.7.3 soname bump
-
-* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.7-2
-- change requires on main package
-
-* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.7-1
-- update to 1.6.7 release
-- split menu setting, settings and 2d into sub-packages
-
-* Wed Nov 14 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.6-3
-- drop requires libgnomekbd (rhbz 874218)
-- fix error in datetime patch
-- drop requires nemo and add to comps instead (rhbz 875197)
-
-* Tue Nov 13 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.6-2
-- add keyboard applet patch
-
-* Sun Nov 11 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.6-1
-- update to 1.6.6 release
-
-* Wed Nov 07 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.4-2
-- add requires gnome-panel (rhbz 872694)
-- add requires libgnomekbd (rhbz 874218)
-
-* Wed Oct 31 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.4-1
-- update to 1.6.4 release
-- change the default apps and panel launchers
-
-* Sat Oct 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.3-1
-- update to 1.6.3 release
-- add license for cinnamon-menu-editor
-- remove -OO from cinnamon-menu-editor script
-- drop upstream patch
-
-* Sat Oct 13 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-3
-- autostart for gnome-screensaver so lock works
-- mozilla desktop fix
-
-* Tue Oct 09 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-2
-- fix settings applet icons
-- patch font size (Bzr 864050)
-
-* Thu Sep 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.1-1
-- update to 1.6.1 release
-
-* Wed Sep 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.0-3
-- remove requires nautilus and swap it for nemo
-- drop nemo patch
-
-* Tue Sep 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.0-2
-- patch bluetooth applet
-
-* Mon Sep 17 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.6.0-1
-- update to 1.6.0 release
-- drop upstream patches
-- add requires python-imaging, gnome-python2-gconf and python-imaging
-- patch to use nautilus instead of nemo
-
-* Thu Aug 23 2012 Dan Horák <dan[at]danny.cz> - 1.5.2-6
-- fix build without BlueTooth
-
-* Fri Aug 17 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-5
-- rebuilt for new cogl version
-- patch bluetooth applet
-- use patch to fix windows quick list applet
-- patch for new cogl api
-
-* Sun Aug 12 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-4
-- Fix directory ownership
-
-* Sun Jul 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-3
-- Add requires nautilus for settings
-- Remove fedora logo from package to enable generic spins
-
-* Fri Jul 27 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-2
-- patch systray applet
-
-* Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.2-1
-- update to 1.5.2 release
-
-* Tue Jul 24 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-0.1.git49593cb
-- Update to the latest snapshot
-- Remove buildrequires telepathy-glib-devel, telepathy-logger-devel and folks-devel
-- Drop obsolete patches
-- Add buildrequires libsoup-devel libgnome-keyring-devel
-
-* Sat Jul 21 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.10.git7959517
-- Add requires accountsservice-libs
-
-* Sat Jul 21 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.9.git7959517
-- Add patch to port window settings to gsettings
-
-* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.8.git7959517
-- filter provides and requires
-- Remove requires dbus-x11
-- Add -p to install
-
-* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.7.git7959517
-- Remove %%define and rebase settings patch
-- Hardcode version for patches
-- Rearrange patches
-- Use install rather than cp
-- Fix scriptlets
-- Remove hardcoded file name from %%prep
-- Preserve timestamps in %%install
-- Remove extension from manpage in %%files
-- Add requires dbus-x11
-
-* Fri Jul 20 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.6.git7959517
-- Fix macro in comment rpmlint error
-
-* Thu Jul 19 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.5.git7959517
-- Correct spelling mistake
-- Add descriptions for patches
-
-* Wed Jul 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.4.git7959517
-- bump spec version to fix repo issue
-
-* Wed Jul 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.3.git7959517
-- bump spec version to fix repo issue
-
-* Wed Jul 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.2.git7959517
-- bump spec version to fix repo issue
-
-* Wed Jul 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.1.git7959517
-- Update to the latest snapshot
-
-* Mon May 28 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-5.UP1
-- Silence glib-compile-schemas scriplets
-- fix firefox patch for f17
-- fix power applet for f16
-
-* Mon May 28 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-4.UP1
-- add notification patch
-
-* Mon May 28 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-3.UP1
-- change %%define to %%global
-- fix files listed twice in %%files section
-- version patches
-- remove %%config from files (gnome-shell and gnome-menus doesn't use them
- for the equivalent files)
-- drop login theme patch
-
-* Sun May 27 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-2.UP1
-- add configure option so it compiles on F17
-- fix release tag
-
-* Sun May 27 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-1.UP1
-- update to 1.4.0.UP1-1
-
-* Wed Mar 14 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-2
-- fix un-themed shutdown
-
-* Tue Mar 13 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.4.0-1
-- update to 1.4.0
-
-* Mon Feb 20 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.3.1-1
-- update to 1.3.1
-- remove static lib
-- remove mozilla plugin
-
-* Fri Feb 17 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.3.0-1
-- update to 1.3.0 release
-
-* 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
-- add only-show-in=GNOME to settings desktop file
-- make changes for source changes, applets, settings and session added
-- delete session files and use my own
-- move settings from lib to usr (it had no libs)
-- replace menu icon
-- change description
-
-* Wed Jan 04 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.1.3-2
-- add requires gnome-session
-- clean up spec file ready for review
-
-* Mon Jan 02 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.1.3-1
-- update to version 1.1.3
-
-* Sun Jan 01 2012 Leigh Scott <leigh123linux at fedoraproject.org> - 1.1.2-2
-- fix firefox launchers
-
-* Fri Dec 30 2011 Leigh Scott <leigh123linux at fedoraproject.org> - 1.1.2-1
-- first build based on gnome-shell srpm
-- add session files
-
More information about the scm-commits
mailing list