From 72e37d93902ef50d490f0524a2c0d1d3411c2e47 Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Aug 30 2017 08:58:03 +0000 Subject: Merge branch 'master' into epel7 --- diff --git a/.gitignore b/.gitignore index ea58993..b31e177 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +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-*.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 b9ea1ba..71dcd95 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -1,69 +1,57 @@ -#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 2.8.0 - Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 2.8.0 -Release: 4%{?dist} +Version: 3.4.2 +Release: 2%{?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 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-login) -# 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 +URL: https://github.com/linuxmint/ +Source0: %url/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz + +BuildRequires: autoconf +BuildRequires: automake BuildRequires: intltool +BuildRequires: autoconf-archive +BuildRequires: glib2-devel +BuildRequires: libtool +BuildRequires: gobject-introspection-devel BuildRequires: pam-devel -%if 0%{?rhel} == 7 -BuildRequires: webkitgtk3-devel -%else -BuildRequires: webkitgtk4-devel -%endif +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: python3 +%else # 0%%{?fedora} || 0%%{?rhel} >= 8 +BuildRequires: python2 +%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 +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.4.0 +Requires: cinnamon-translations >= 3.2.0 +Requires: xapps +Requires: accountsservice-libs +Requires: libgnomekbd +%if 0%{?fedora} || 0%{?rhel} >= 8 +Requires: python3-gobject +Requires: python3-setproctitle +Requires: python3-xapp +%else # 0%%{?fedora} || 0%%{?rhel} >= 8 +Requires: pygobject2 +Requires: python-setproctitle +Requires: python-xapp +%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 # 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} -%if 0%{?rhel} == 7 -Requires: webkitgtk3 -%else +Conflicts: xscreensaver < 1:5.00-19 +Requires: %{name} = %{version}-%{release} Requires: webkitgtk4 -%endif Requires: xscreensaver-extras Requires: xscreensaver-gl-extras @@ -74,46 +62,165 @@ you may need to use the Esc key to get the unlock screen. %endif %prep -%setup -q -%patch0 -p1 -echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am -echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac - +%autosetup -p1 NOCONFIGURE=1 ./autogen.sh %build -%configure --with-mit-ext=no -make V=1 %{?_smp_mflags} +%configure +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +%make_build V=1 %install -%{make_install} +%make_install desktop-file-install \ --delete-original \ --remove-only-show-in=Xfce \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/cinnamon-screensaver.desktop + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/cinnamon-screensaver.desktop %if 0%{?rhel} -rm -rf $RPM_BUILD_ROOT%{_datadir}/cinnamon-screensaver/ +rm -rf %{buildroot}%{_datadir}/cinnamon-screensaver/ %endif +# Fix rpmlint errors +for file in %{buildroot}%{_datadir}/cinnamon-screensaver/{dbusdepot,util,widgets}/*.py; do +chmod a+x $file +done +for file in %{buildroot}%{_datadir}/cinnamon-screensaver/*.py; do +chmod a+x $file +done +chmod a-x %{buildroot}%{_datadir}/cinnamon-screensaver/{dbusdepot,util,widgets}/__init__.py +chmod a-x %{buildroot}%{_datadir}/cinnamon-screensaver/{__init__,config}.py +chmod a+x %{buildroot}%{_datadir}/cinnamon-screensaver/pamhelper/authClient.py + +# Delete development files +rm %{buildroot}%{_libdir}/libcscreensaver.la +rm %{buildroot}%{_libdir}/libcscreensaver.so +rm %{buildroot}%{_libdir}/pkgconfig/cscreensaver.pc +rm %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir +rm %{buildroot}%{_includedir}/cinnamon-screensaver/libcscreensaver/*.h + +%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 +%config(noreplace) %{_sysconfdir}/pam.d/cinnamon-screensaver %{_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/*/* +%{_libexecdir}/cinnamon-screensaver-pam-helper +%{_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 +* Wed Aug 30 2017 Björn Esser - 3.4.2-2 +- Adjustments for EPEL + +* Wed Aug 09 2017 Leigh Scott - 3.4.2-1 +- update to 3.4.2 release + +* Wed Aug 02 2017 Fedora Release Engineering - 3.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Jun 24 2017 Leigh Scott - 3.4.1-2 +- add missing python3-xapp requires + +* Wed Jun 21 2017 Leigh Scott - 3.4.1-1 +- update to 3.4.1 release + +* Thu May 04 2017 Leigh Scott - 3.4.0-1 +- update to 3.4.0 release + +* Fri Apr 21 2017 Leigh Scott - 3.4.0-0.1.20170421git358369e +- update to latest git snapshot + +* Thu Mar 09 2017 Leigh Scott - 3.2.14-0.4.20170308git39da3f0 +- update to latest git snapshot + +* Wed Mar 08 2017 Leigh Scott - 3.2.14-0.3.20170308git55a26c2 +- update to latest git snapshot + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2.14-0.2.20170124git5561f3c +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 24 2017 Leigh Scott - 3.2.14-0.1.20170124git5561f3c +- update to git snapshot + +* Tue Jan 10 2017 leigh scott - 3.2.13-2 +- add some upstream commits (fixes rhbz 1399731) + +* Sun Jan 08 2017 Leigh Scott - 3.2.13-1 +- update to 3.2.13 release + +* Sat Dec 24 2016 leigh scott - 3.2.12-1 +- update to 3.2.12 release +- patch to hide message strings + +* Thu Dec 22 2016 leigh scott - 3.2.11-1 +- update to 3.2.11 release + +* Mon Dec 19 2016 Miro Hrončok - 3.2.9-3 +- Rebuild for Python 3.6 + +* Thu Dec 15 2016 leigh scott - 3.2.9-2 +- patch to fix cinnamon-screensaver-pam-helper rpmlint error + +* Mon Dec 12 2016 leigh scott - 3.2.9-1 +- update to 3.2.9 release + +* Sun Dec 11 2016 leigh scott - 3.2.7-2 +- add missing requires python3-setproctitle + +* Sat Dec 10 2016 leigh scott - 3.2.7-1 +- update to 3.2.7 release + +* Thu Nov 24 2016 leigh scott - 3.2.6-1 +- update to 3.2.6 release + +* Thu Nov 17 2016 leigh scott - 3.2.3-1 +- update to 3.2.3 release + +* Wed Nov 09 2016 leigh scott - 3.2.0-2 +- Fix python gi requires + +* 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 + +* Sat Apr 23 2016 Leigh Scott - 3.0.0-1 +- update to 3.0.0 release + +* Wed Feb 03 2016 Fedora Release Engineering - 2.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Nov 27 2015 Leigh Scott - 2.8.0-4 - remove unsupported sub-package for epel as there is no xscreensaver diff --git a/sources b/sources index 8503c43..6c187de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -946f44c5243e7a5852dfa06a9a1c9a08 cinnamon-screensaver-2.8.0.tar.gz +SHA512 (cinnamon-screensaver-3.4.2.tar.gz) = 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764