|
@@ -1,9 +1,9 @@
|
|
|
-%define tarball_id g3f5259b
|
|
|
-%define source_id b632726
|
|
|
+%define tarball_id g4a6969f
|
|
|
+%define source_id d421fd9
|
|
|
|
|
|
Name: cinnamon
|
|
|
Summary: A Linux Desktop featuring a traditional layout and modern technology
|
|
|
-Version: 1.6.3
|
|
|
+Version: 1.6.4
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: User Interface/Desktops
|
|
@@ -19,7 +19,7 @@ Patch101: cinnamon-vine-settings.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
|
|
|
-BuildRequires: muffin-devel >= 1.0.2
|
|
|
+BuildRequires: muffin-devel >= 1.1.2
|
|
|
BuildRequires: gjs-devel >= 1.29.18
|
|
|
BuildRequires: gstreamer-plugins-base-devel >= 0.10.16
|
|
|
BuildRequires: folks-devel >= 0.5.2
|
|
@@ -36,12 +36,15 @@ BuildRequires: gnome-desktop3-devel >= 2.90.0
|
|
|
BuildRequires: pulseaudio-libs-devel
|
|
|
BuildRequires: libgudev1-devel
|
|
|
BuildRequires: libcanberra-gtk3-devel
|
|
|
-BuildRequires: GConf2-devel
|
|
|
+BuildRequires: ca-certificates
|
|
|
+BuildRequires: GConf2-devel
|
|
|
BuildRequires: gnome-common
|
|
|
|
|
|
Requires(postun,posttrans): glib2
|
|
|
Requires(postun,posttrans): desktop-file-utils
|
|
|
Requires: muffin
|
|
|
+Requires: python-imaging
|
|
|
+Requires: ca-certificates
|
|
|
|
|
|
%description
|
|
|
Cinnamon is a Linux desktop which provides advanced innovative features and a traditional user experience.
|
|
@@ -59,16 +62,13 @@ The emphasis is put on making users feel at home and providing them with an easy
|
|
|
NOCONFIGURE=1 ./autogen.sh
|
|
|
%configure \
|
|
|
--disable-static \
|
|
|
- --with-ca-certificates=%{_datadir}/ssl/certs/ca-bundle.crt \
|
|
|
- --enable-compile-warnings=minimum
|
|
|
+ --enable-compile-warnings=minimum
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
|
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
|
|
|
|
|
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
|
|
@@ -135,6 +135,11 @@ update-desktop-database -q &> /dev/null || :
|
|
|
%{_mandir}/man1/*.1.gz
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Oct 26 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.4-1
|
|
|
+- new upstream release
|
|
|
+- add BuildRequires: ca-certificates
|
|
|
+- add Requires: python-imaging
|
|
|
+
|
|
|
* Wed Oct 24 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.3-1
|
|
|
- new upstream release
|
|
|
|