diff --git a/.gitignore b/.gitignore index a9931b6..6f32258 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cinnamon-screensaver-1.8.0.tar.gz +/cinnamon-screensaver-1.8.1.git94ca899.tar.gz diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index 4652ea4..6d6ca71 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -1,20 +1,23 @@ +%global _internal_version 94ca899 + %global gtk3_version 2.99.3 %global dbus_version 0.90 %global dbus_glib_version 0.74 %global redhat_menus_version 5.0.1 -%global gnome_desktop3_version 3.1.91 %global libgnomekbd_version 2.91.1 Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 1.8.0 -Release: 5%{?dist} +Version: 1.8.1 +Release: 0.1.git%{_internal_version}%{?dist} License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com #Because linuxmint upstream refuses to host pristine upstream tarballs -#wget https://github.com/linuxmint/cinnamon-screensaver/archive/%{version}.tar.gz -O %{name}-%{version}.tar.gz -Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz +#wget https://github.com/linuxmint/cinnamon-screensaver/archive/%{version}.tar.gz -O cinnamon-screensaver-%{version}.tar.gz +# for git +# wget https://github.com/linuxmint/cinnamon-screensaver/tarball/%%{_internal_version} -O cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz +Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.git%{_internal_version}.tar.gz Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch Patch1: systemd.patch @@ -23,7 +26,7 @@ Patch1: systemd.patch BuildRequires: gtk3-devel => %{gtk3_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} -BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version} +BuildRequires: cinnamon-desktop-devel BuildRequires: pam-devel BuildRequires: nss-devel BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel @@ -39,7 +42,7 @@ BuildRequires: libXtst-devel BuildRequires: desktop-file-utils BuildRequires: systemd-devel -Requires: gsettings-desktop-schemas >= 0.1.7 +Requires: cinnamon-desktop Requires: redhat-menus >= %{redhat_menus_version} # since we use it, and pam spams the log if a module is missing Requires: gnome-keyring-pam @@ -52,7 +55,7 @@ BuildRequires: libxklavier-devel cinnamon-screensaver is a screen saver and locker. %prep -%setup -q +%setup -q -n linuxmint-%{name}-%{_internal_version} %patch0 -p1 %patch1 -p1 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am @@ -88,6 +91,11 @@ desktop-file-install \ %doc %{_mandir}/man1/*.1.gz %changelog +* Sun Aug 25 2013 Leigh Scott - 1.8.1-0.1.git94ca899 +- update to latest git +- Change buildrequires to cinnamon-desktop-devel +- Change requires to cinnamon-desktop + * Thu Aug 22 2013 Leigh Scott - 1.8.0-5 - rebuilt diff --git a/sources b/sources index 71df95a..0057793 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27777ad2271154916544f036602c6a47 cinnamon-screensaver-1.8.0.tar.gz +6830e30940c25e8ff549279eb8aab484 cinnamon-screensaver-1.8.1.git94ca899.tar.gz