Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package NsCDE for openSUSE:Factory checked
in at 2023-02-20 17:45:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NsCDE (Old)
and /work/SRC/openSUSE:Factory/.NsCDE.new.22824 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NsCDE"
Mon Feb 20 17:45:58 2023 rev:2 rq:1066670 version:2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/NsCDE/NsCDE.changes 2022-08-12
16:06:27.103435369 +0200
+++ /work/SRC/openSUSE:Factory/.NsCDE.new.22824/NsCDE.changes 2023-02-20
17:46:14.339562204 +0100
@@ -1,0 +2,8 @@
+Fri Feb 10 01:58:28 UTC 2023 - Maurizio Galli <maurizio.ga...@suse.com>
+
+- Remove doc files because contain scripts etc that cause OBS to fail
+- Fix duplicate filews causing OBS to fail
+- Fix .desktop file to use X-NsCDE instead of NsCDE
+- Fix Python scripts shebangs
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NsCDE.spec ++++++
--- /var/tmp/diff_new_pack.Vudjmw/_old 2023-02-20 17:46:17.239578587 +0100
+++ /var/tmp/diff_new_pack.Vudjmw/_new 2023-02-20 17:46:17.271578767 +0100
@@ -26,6 +26,7 @@
# PATCH-FIX-OPENSUSE leafpad.patch maurizio.ga...@suse.com -- add leafpad to
recognized texteditors
Patch0: leafpad.patch
BuildRequires: automake
+BuildRequires: fdupes
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gettext-tools
@@ -34,6 +35,7 @@
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
BuildRequires: make
+BuildRequires: update-desktop-files
BuildRequires: xorg-x11-proto-devel
Requires: fvwm2
Recommends: pcmanfm
@@ -55,25 +57,37 @@
%prep
%autosetup -p1
+# Fix .desktop files
+sed -i 's/OnlyShowIn=NsCDE;/OnlyShowIn=X-NsCDE;/g' ./xdg/applications/*.desktop
+
+# Fix python shebangs
+find . -name '*.in' -exec sed -i 's:#!@PYTHON@:#!/usr/bin/python3:g' {} +
+
%build
%configure
%make_build
%install
%make_install
-%find_lang %{name} --all-name
-%files -f %{name}.lang
+# Remove doc files, not useful and cause build failures with OBS
+rm -rf %{buildroot}%{_datadir}/doc/nscde
+
+# fix duplicate files
+%fdupes -s %{buildroot}%{_datadir}/icons/NsCDE
+%fdupes -s %{buildroot}%{_datadir}/NsCDE
+
+
+%find_lang %{name} --all-name
+
+%files -f %{name}.lang
%license COPYING
%doc ChangeLog
-
%{_bindir}/nscde
%{_bindir}/nscde_fvwmclnt
-%dir %{_datadir}/doc/nscde
-%doc %{_datadir}/doc/nscde/*
%dir %{_datadir}/icons/NsCDE
%{_datadir}/icons/NsCDE/*
%dir %{_datadir}/NsCDE
