From c912d12dd17fc554e652011c5a6cc140afaeb826 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Nov 07 2016 22:02:41 +0000 Subject: update to 3.2.0 release --- diff --git a/.gitignore b/.gitignore index c61a273..b31e177 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,2 @@ -/cinnamon-screensaver-1.8.0.tar.gz -/cinnamon-screensaver-1.8.1.git94ca899.tar.gz -/cinnamon-screensaver-1.8.1.git4f741eb.tar.gz -/cinnamon-screensaver-1.9.1.tar.gz -/cinnamon-screensaver-2.0.0.tar.gz -/cinnamon-screensaver-2.0.1.tar.gz -/cinnamon-screensaver-2.0.2.tar.gz -/cinnamon-screensaver-2.0.3.tar.gz -/cinnamon-screensaver-2.2.0.tar.gz -/cinnamon-screensaver-2.2.1.tar.gz -/cinnamon-screensaver-2.2.3.tar.gz -/cinnamon-screensaver-2.2.4.tar.gz -/cinnamon-screensaver-2.4.0.gitaf298bc.tar.gz -/cinnamon-screensaver-2.4.0.git8de7ff0.tar.gz -/cinnamon-screensaver-2.4.0.tar.gz -/cinnamon-screensaver-2.4.1.tar.gz -/cinnamon-screensaver-2.4.2.tar.gz -/cinnamon-screensaver-2.5.0.git6ea738d.tar.gz -/cinnamon-screensaver-2.5.0.gitc4820fd.tar.gz -/cinnamon-screensaver-2.6.0.tar.gz -/cinnamon-screensaver-2.6.1.tar.gz -/cinnamon-screensaver-2.6.3.tar.gz -/cinnamon-screensaver-2.6.4.tar.gz -/cinnamon-screensaver-2.8.0.tar.gz -/cinnamon-screensaver-3.0.0.tar.gz -/cinnamon-screensaver-3.0.1.tar.gz +/cinnamon-screensaver-*.tar.gz +/cinnamon-screensaver-*.src.rpm diff --git a/cinnamon-screensaver-2.20.0-selinux-permit.patch b/cinnamon-screensaver-2.20.0-selinux-permit.patch deleted file mode 100644 index 7d44ee0..0000000 --- a/cinnamon-screensaver-2.20.0-selinux-permit.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/data/cinnamon-screensaver -+++ b/data/cinnamon-screensaver -@@ -1,11 +1,12 @@ - #%PAM-1.0 - - # Fedora Core -+auth [success=done ignore=ignore default=bad] pam_selinux_permit.so -+session include system-auth - auth include system-auth - auth optional pam_gnome_keyring.so - account include system-auth - password include system-auth --session include system-auth - - # SuSE/Novell - #auth include common-auth diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index 7b17063..3834eea 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -1,66 +1,47 @@ -#global _internal_version 024e5fd - -%global dbus_glib_version 0.74 -%global redhat_menus_version 5.0.1 -%global libgnomekbd_version 2.91.1 -%global cinnamon_desktop_version 3.0.0 - Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 3.0.1 +Version: 3.2.0 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com +Source0: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -#Because linuxmint upstream refuses to host pristine upstream tarballs -#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/cinnamon-screensaver-%%{version}.git%%{_internal_version}.tar.gz -Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz - -Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch - -BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} -BuildRequires: pkgconfig(cinnamon-desktop) >= %{cinnamon_desktop_version} -BuildRequires: pkgconfig(nss) -BuildRequires: pkgconfig(xscrnsaver) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(libgnomekbd) >= %{libgnomekbd_version} -BuildRequires: pkgconfig(libsystemd) -# this is here because the configure tests look for protocol headers -BuildRequires: pkgconfig(libxklavier) -BuildRequires: pkgconfig(xxf86misc) -BuildRequires: pkgconfig(xxf86vm) -BuildRequires: pkgconfig(xtst) -BuildRequires: desktop-file-utils -BuildRequires: gnome-common +BuildRequires: autoconf +BuildRequires: automake BuildRequires: intltool -BuildRequires: pam-devel -%if 0%{?rhel} == 7 -BuildRequires: pkgconfig(webkitgtk-3.0) -%else -BuildRequires: pkgconfig(webkit2gtk-4.0) -%endif +BuildRequires: autoconf-archive +BuildRequires: glib2-devel +BuildRequires: libtool +BuildRequires: gobject-introspection-devel +BuildRequires: python3 +BuildRequires: gtk3-devel +BuildRequires: libXext-devel +BuildRequires: desktop-file-utils + -# add hard cinnamon-desktop required version due logind schema -Requires: cinnamon-desktop >= %{cinnamon_desktop_version} -Requires: cinnamon-translations >= 2.6.0 -Requires: redhat-menus >= %{redhat_menus_version} +Requires: cinnamon-desktop >= 3.2.0 +Requires: cinnamon-translations >= 3.0.0 +Requires: xapps +Requires: accountsservice-libs +Requires: libgnomekbd +Requires: python-gobject-base +# Not available for F25 and below +#Requires: python3-xlib # since we use it, and pam spams the log if a module is missing Requires: gnome-keyring-pam -Conflicts: xscreensaver < 1:5.00-19 + %description cinnamon-screensaver is a screen saver and locker. %if 0%{?fedora} %package unsupported -Summary: Additional unsupported screensavers +Summary: Additional unsupported screensavers BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Conflicts: xscreensaver < 1:5.00-19 +Requires: %{name} = %{version}-%{release} %if 0%{?rhel} == 7 -Requires: webkitgtk3 +Requires: webkitgtk3 %else Requires: webkitgtk4 %endif @@ -75,18 +56,14 @@ you may need to use the Esc key to get the unlock screen. %prep %setup -q -%patch0 -p1 -echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am -echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac -sed -i -e 's@Ubuntu@Cantarell@g' src/gs-lock-plug.c src/gs-window-x11.c NOCONFIGURE=1 ./autogen.sh %build -%configure --with-mit-ext=no -make V=1 %{?_smp_mflags} +%configure +%make_build V=1 %install -%{make_install} +%make_install desktop-file-install \ --delete-original \ @@ -98,22 +75,58 @@ desktop-file-install \ rm -rf $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/ %endif +for file in $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/{dbusdepot,util,widgets}/*.py; do + chmod a+x $file +done +for file in $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/*.py; do + chmod a+x $file +done +chmod a-x $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/{dbusdepot,util,widgets}/__init__.py +chmod a-x $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/{__init__.py,config.py} + +# Delete development files +rm $RPM_BUILD_ROOT%{_libdir}/libcscreensaver.la +rm $RPM_BUILD_ROOT%{_libdir}/libcscreensaver.so +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/cscreensaver.pc +rm $RPM_BUILD_ROOT%{_datadir}/gir-1.0/CScreensaver-1.0.gir + + +%post +/sbin/ldconfig +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +/sbin/ldconfig +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README.md %license COPYING COPYING.LIB %{_bindir}/cinnamon-screensaver* %{_datadir}/applications/cinnamon-screensaver.desktop +%{_datadir}/cinnamon-screensaver/ +%exclude %{_datadir}/cinnamon-screensaver/screensavers/ %{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service -%{_libexecdir}/cinnamon-screensaver-dialog -%config %{_sysconfdir}/pam.d/cinnamon-screensaver -%{_mandir}/man1/cinnamon-screensaver*.1.* +%{_datadir}/icons/hicolor/scalable/*/* +%{_libdir}/libcscreensaver.so.* +%{_libdir}/girepository-1.0/CScreensaver-1.0.typelib %if 0%{?fedora} %files unsupported -%{_datadir}/cinnamon-screensaver/ +%{_datadir}/cinnamon-screensaver/screensavers/ %endif %changelog +* Mon Nov 07 2016 Leigh Scott - 3.2.0-1 +- update to 3.2.0 release + * Mon May 30 2016 Leigh Scott - 3.0.1-1 - update to 3.0.1 release diff --git a/sources b/sources index 3f2a421..92b71c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -787c138c5dcb4d3b09a4d69d86214ad6 cinnamon-screensaver-3.0.1.tar.gz +ee180059bad69342d888be0deb29793a cinnamon-screensaver-3.2.0.tar.gz