Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-screensaver for
openSUSE:Factory checked in at 2024-08-21 23:25:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Wed Aug 21 23:25:06 2024 rev:30 rq:1195086 version:6.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2024-03-18 16:46:34.955437545 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.2698/cinnamon-screensaver.changes
2024-08-21 23:25:30.288306121 +0200
@@ -1,0 +2,10 @@
+Thu Aug 15 08:47:49 UTC 2024 - Richard Rahl <[email protected]>
+
+- update to 6.2.0:
+ * nothing relevant for openSUSE
+- create seperate packages for devel, typelib and library files, so
+ people who want to actually use these files, don't have to compile it
+ themselves
+- remove support for older Leap releases than 1500
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-6.0.3.tar.gz
New:
----
cinnamon-screensaver-6.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.418TEA/_old 2024-08-21 23:25:30.752325494 +0200
+++ /var/tmp/diff_new_pack.418TEA/_new 2024-08-21 23:25:30.756325661 +0200
@@ -16,21 +16,20 @@
#
+%define appid org.cinnamon.ScreenSaver
Name: cinnamon-screensaver
-Version: 6.0.3
+Version: 6.2.0
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0-or-later
-Group: System/GUI/Other
URL: https://github.com/linuxmint/cinnamon-screensaver
-Source:
https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE cinnamon-screensaver-suse-pam.patch -- Use SUSE-specific
PAM configuration.
Patch0: %{name}-suse-pam.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: libtool
BuildRequires: meson
-BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: python3 >= 3.4
BuildRequires: update-desktop-files
@@ -40,6 +39,11 @@
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libxdo)
+%if 0%{?suse_version} >= 1600
+BuildRequires: pkgconfig(pam)
+%else
+BuildRequires: pam-devel
+%endif
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
Requires: iso-country-flags-png
@@ -49,7 +53,6 @@
Requires: python3-gobject-cairo
Requires: python3-setproctitle
Requires: python3-xapp
-Recommends: %{name}-lang
Recommends: xscreensaver-data
Suggests: xscreensaver-data-extra
@@ -58,37 +61,59 @@
simple, sane and secure defaults, and be well integrated with the
Cinnamon Desktop.
+%package -n libcscreensaver-0_0_0
+Summary: Library files for %{name}
+
+%description -n libcscreensaver-0_0_0
+%{summary}.
+
+This package ships the library files for %{name}.
+
+%package -n typelib-1_0-CScreensaver-1_0
+Summary: Typelib for %{name}
+
+%description -n typelib-1_0-CScreensaver-1_0
+%{summary}.
+
+This package ships the typelib for %{name}.
+
+%package devel
+Summary: Development files for %{name}
+Requires: libcscreensaver-0_0_0
+Requires: typelib-1_0-CScreensaver-1_0
+
+%description devel
+%{summary}.
+
+Development files for %{name}.
+
%prep
%autosetup -p1
%build
-%meson
+%meson \
+ -Dsetres=false \
+ -Dlocking=true \
+ -Dxinerama=true \
+ -Duse-debian-pam=false \
+ -Ddeprecated-warnings=true
%meson_build
%install
-# Manually install desktop file
-mkdir -p %{buildroot}%{_datadir}/applications/
-cp -r data/org.cinnamon.ScreenSaver.desktop
%{buildroot}%{_datadir}/applications/org.cinnamon.ScreenSaver.desktop
-
%meson_install
-# Remove development files as they're not really there to be used.
-rm -rf %{buildroot}%{_libdir}/libcscreensaver.so \
- %{buildroot}%{_includedir}/%{name}/ \
- %{buildroot}%{_libdir}/pkgconfig/cscreensaver.pc \
- %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir
-
-find %{buildroot} -type f -name "*.la" -delete -print
-%fdupes %{buildroot}%{_datadir}/
-%suse_update_desktop_file org.cinnamon.ScreenSaver
+%fdupes %{buildroot}
+%suse_update_desktop_file %{appid}
+
+mkdir -p %{buildroot}%{_pam_vendordir}
+mv %{buildroot}%{_sysconfdir}/pam.d/%{name}
%{buildroot}%{_pam_vendordir}/%{name}
# Fix missing shabang
-chmod a-x %{buildroot}%{_datadir}/%{name}/__init__.py
-chmod a-x %{buildroot}%{_datadir}/%{name}/*/__init__.py
+chmod a+x %{buildroot}%{_datadir}/%{name}/*.py
+chmod a+x %{buildroot}%{_datadir}/%{name}/*/*.py
-%if 0%{?suse_version} > 1500
-mkdir -p %{buildroot}%{_pam_vendordir}
-mv %{buildroot}%{_sysconfdir}/pam.d/cinnamon-screensaver
%{buildroot}%{_pam_vendordir}
+# remove the executable bit for these files (above we add it, out of
convenience)
+chmod a-x
%{buildroot}%{_datadir}/%{name}/{__init__.py,config.py,dbusdepot/__init__.py,util/__init__.py,widgets/__init__.py}
%pre
# Prepare for migration to /usr/lib; save any old .rpmsave
@@ -101,40 +126,28 @@
for i in pam.d/cinnamon-screensaver ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i} ||:
done
-%endif
-%post
-/sbin/ldconfig
-%if 0%{?suse_version} < 1500
-%desktop_database_post
-%icon_theme_cache_post
-%endif
-
-%postun
-/sbin/ldconfig
-%if 0%{?suse_version} < 1500
-%desktop_database_postun
-%icon_theme_cache_postun
-%endif
+%ldconfig_scriptlets -n libcscreensaver-0_0_0
%files
-%license COPYING*
-%doc AUTHORS README.md debian/changelog
-%if 0%{?suse_version} > 1500
-%{_pam_vendordir}/cinnamon-screensaver
-%else
-%config %{_sysconfdir}/pam.d/cinnamon-screensaver
-%endif
-%{_bindir}/%{name}
-%{_bindir}/%{name}-command
-%{_libexecdir}/cs-backup-locker
-%{_bindir}/cinnamon-unlock-desktop
-%{_libexecdir}/%{name}-pam-helper
-%{_datadir}/%{name}/
-%{_libdir}/libcscreensaver.so*
+%license COPYING COPYING.LIB
+%doc AUTHORS README.md HACKING
+%{_bindir}/{%{name}{,-command},cinnamon-unlock-desktop}
+%{_datadir}/applications/%{appid}.desktop
+%{_libexecdir}/{%{name}-pam-helper,cs-backup-locker}
+%{_datadir}/%{name}
+%{_datadir}/dbus-1/services/%{appid}.service
+%{_datadir}/icons/hicolor/scalable/{actions,apps,status}/*.svg
+%{_pam_vendordir}/%{name}
+
+%files -n typelib-1_0-CScreensaver-1_0
%{_libdir}/girepository-1.0/CScreensaver-1.0.typelib
-%{_datadir}/dbus-1/services/org.cinnamon.ScreenSaver.service
-%{_datadir}/applications/org.cinnamon.ScreenSaver.desktop
-%{_datadir}/icons/hicolor/*/*/screensaver-*.*
-%{_datadir}/icons/hicolor/scalable/apps/csr-backup-locker-icon.svg
+
+%files -n libcscreensaver-0_0_0
+%{_libdir}/libcscreensaver.so.*
+
+%files devel
+%{_datadir}/gir-1.0/CScreensaver-1.0.gir
+%{_libdir}/pkgconfig/cscreensaver.pc
+%{_libdir}/libcscreensaver.so
++++++ cinnamon-screensaver-6.0.3.tar.gz -> cinnamon-screensaver-6.2.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.3/debian/changelog
new/cinnamon-screensaver-6.2.0/debian/changelog
--- old/cinnamon-screensaver-6.0.3/debian/changelog 2024-01-24
16:26:06.000000000 +0100
+++ new/cinnamon-screensaver-6.2.0/debian/changelog 2024-06-11
17:57:50.000000000 +0200
@@ -1,3 +1,10 @@
+cinnamon-screensaver (6.2.0) wilma; urgency=medium
+
+ [ Michael Webster ]
+ * debian: Don't install CScreensaver-1.0.gir.
+
+ -- Clement Lefebvre <[email protected]> Tue, 11 Jun 2024 16:57:29 +0100
+
cinnamon-screensaver (6.0.3) virginia; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.3/debian/control
new/cinnamon-screensaver-6.2.0/debian/control
--- old/cinnamon-screensaver-6.0.3/debian/control 2024-01-24
16:26:06.000000000 +0100
+++ new/cinnamon-screensaver-6.2.0/debian/control 2024-06-11
17:57:50.000000000 +0200
@@ -70,7 +70,7 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${gir:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: library and introspection data used by cinnamon-screensaver
cinnamon-screensaver is a screen saver and locker that aims to have simple,
sane and secure defaults, and be well integrated with the Cinnamon desktop.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.0.3/debian/libcscreensaver0.install
new/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install
--- old/cinnamon-screensaver-6.0.3/debian/libcscreensaver0.install
2024-01-24 16:26:06.000000000 +0100
+++ new/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install
2024-06-11 17:57:50.000000000 +0200
@@ -1,4 +1,3 @@
usr/lib/*/girepository-1.0/CScreensaver-1.0.typelib
usr/lib/*/libcscreensaver.so.0
usr/lib/*/libcscreensaver.so.0.*
-usr/share/gir-1.0/CScreensaver-1.0.gir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.3/debian/not-installed
new/cinnamon-screensaver-6.2.0/debian/not-installed
--- old/cinnamon-screensaver-6.0.3/debian/not-installed 2024-01-24
16:26:06.000000000 +0100
+++ new/cinnamon-screensaver-6.2.0/debian/not-installed 2024-06-11
17:57:50.000000000 +0200
@@ -6,3 +6,4 @@
# precompiled python files
*/__pycache__/
+usr/share/gir-1.0/CScreensaver-1.0.gir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.3/debian/rules
new/cinnamon-screensaver-6.2.0/debian/rules
--- old/cinnamon-screensaver-6.0.3/debian/rules 2024-01-24 16:26:06.000000000
+0100
+++ new/cinnamon-screensaver-6.2.0/debian/rules 2024-06-11 17:57:50.000000000
+0200
@@ -4,7 +4,7 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
- dh $@ --with=python3,gir
+ dh $@ --with=python3
override_dh_strip:
dh_strip --dbg-package=libcscreensaver-dbg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.3/meson.build
new/cinnamon-screensaver-6.2.0/meson.build
--- old/cinnamon-screensaver-6.0.3/meson.build 2024-01-24 16:26:06.000000000
+0100
+++ new/cinnamon-screensaver-6.2.0/meson.build 2024-06-11 17:57:50.000000000
+0200
@@ -1,4 +1,4 @@
-project('cinnamon-screensaver', 'c', version: '6.0.3', meson_version:
'>=0.56.0')
+project('cinnamon-screensaver', 'c', version : '6.2.0', meson_version :
'>=0.56.0')
cc = meson.get_compiler('c')
