$ git show --format=fuller --patch-with-stat --summary 627e4c57cc3fe5bcba157509fad08a266c92b99f

commit 627e4c57cc3fe5bcba157509fad08a266c92b99f
Author:     mandian <mandian@users.noreply.github.com>
AuthorDate: Wed Dec 6 16:10:25 2023 +0000
Commit:     mandian <mandian@users.noreply.github.com>
CommitDate: Wed Dec 6 16:10:25 2023 +0000

    remove version from names
---
 ... openbox-3.5.0-openmandriva_customisation.patch |   4 +-
 openbox.spec                                       | 125 ++++++++++++---------
 2 files changed, 75 insertions(+), 54 deletions(-)
 rename openbox-3.5.0-mandriva_customisation.patch => openbox-3.5.0-openmandriva_customisation.patch (93%)

diff --git a/openbox-3.5.0-mandriva_customisation.patch b/openbox-3.5.0-openmandriva_customisation.patch
similarity index 93%
rename from openbox-3.5.0-mandriva_customisation.patch
rename to openbox-3.5.0-openmandriva_customisation.patch
index 7010654..195e921 100644
--- a/openbox-3.5.0-mandriva_customisation.patch
+++ b/openbox-3.5.0-openmandriva_customisation.patch
@@ -1,5 +1,5 @@
---- openbox-3.5.0.orig/data/rc.xml	2011-08-02 00:14:58.000000000 +0400
-+++ openbox-3.5.0/data/rc.xml	2012-04-13 07:18:21.763874307 +0400
+--- a/data/rc.xml
++++ b/data/rc.xml
 @@ -49,7 +49,7 @@
  </placement>
  
diff --git a/openbox.spec b/openbox.spec
index f255c30..a7801d0 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,26 +1,28 @@
 %define major 32
 %define obtmajor 2
-%define libobrender %mklibname obrender %{major}
-%define libobt %mklibname obt %{obtmajor}
+%define libobrender	%mklibname obrender
+%define libobt		%mklibname obt
+%define oldlibobrender	%mklibname obrender 32
+%define oldlibobt		%mklibname obt 2
 %define devname %mklibname -d %{name}
 
 Summary:	Windowmanager based on the original blackbox-code
 Name:		openbox
 Version:	3.6.1
-Release:	10
+Release:	11
 Group:		Graphical desktop/Other
 License:	BSD
 Url:		http://openbox.org/
 Source0:	http://openbox.org/dist/openbox/%{name}-%{version}.tar.xz
-Patch0:		openbox-3.5.0-mandriva_customisation.patch
-Patch1:		openbox-3.5.2-unused-libs.patch
-Patch2:		openbox-3.6.1-default-apps.patch
 # oxygen-theme here:
 # http://box-look.org/content/show.php?content=145240
 Source1:	http://box-look.org/CONTENT/content-files/145240-Oxynew.obt
 # (tpg) breeze theme
 #http://box-look.org/content/show.php/Mistral+%28Updated%29?content=167604
 Source2:	mistral_openbox_by_phobi4n-d8ztvoc.tar.xz
+Patch0:		openbox-3.5.2-unused-libs.patch
+Patch1:		openbox-3.6.1-default-apps.patch
+Patch100:	openbox-3.5.0-openmandriva_customisation.patch
 BuildRequires:	gettext-devel
 BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
@@ -47,6 +49,28 @@ Being overall pleased with the window manager, but feeling left unable
 to contribute, this project was born.The Openbox project is developed,
 maintained, and contributed to by these individuals.
 
+%files -f %{name}.lang
+%license CHANGELOG
+%doc AUTHORS README
+%doc %{_docdir}/openbox/*
+%{_bindir}/obxprop
+%{_bindir}/%{name}
+%{_bindir}/openbox-session
+%{_bindir}/startopenbox
+%dir %{_sysconfdir}/xdg/%{name}
+%config(noreplace) %{_sysconfdir}/xdg/%{name}/*
+%{_libexecdir}/openbox-autostart
+%{_libexecdir}/openbox-xdg-autostart
+%{_mandir}/man1/obxprop.1.*
+%{_mandir}/man1/openbox.1.*
+%{_mandir}/man1/openbox-session.1.*
+%{_datadir}/xsessions/openbox.desktop
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*
+%{_datadir}/themes/*
+
+#---------------------------------------------------------------------------
+
 %package kde
 Summary:	KDE support for %{name}
 Group:		Graphical desktop/KDE
@@ -55,6 +79,13 @@ Requires:	%{name} = %{EVRD}
 %description kde
 KDE session support for %{name}.
 
+%files kde
+%{_bindir}/openbox-kde-session
+%{_datadir}/xsessions/openbox-kde.desktop
+%{_mandir}/man1/openbox-kde-session.1.*
+
+#---------------------------------------------------------------------------
+
 %package gnome
 Summary:	GNOME support for %{name}
 Group:		Graphical desktop/GNOME
@@ -63,23 +94,46 @@ Requires:	%{name} = %{EVRD}
 %description gnome
 GNOME session support for %{name}.
 
+%files gnome
+%{_bindir}/gdm-control
+%{_bindir}/gnome-panel-control
+%{_bindir}/openbox-gnome-session
+%{_datadir}/xsessions/openbox-gnome.desktop
+%{_datadir}/gnome-session/sessions/openbox-*.session
+%{_datadir}/gnome/wm-properties/openbox.desktop
+%{_mandir}/man1/openbox-gnome-session.1.*
+
+#---------------------------------------------------------------------------
+
 %package -n %{libobrender}
 Summary:	Libraries from openbox
 Group:		System/Libraries
 Obsoletes:	%{_lib}openbox27 < 3.5.0-8
 Obsoletes:	%{_lib}openbox29 < 3.6.1-1
+Obsoletes:	%oldlibobrender < %{EVRD}
 
 %description -n %{libobrender}
 This package contains a shared library for %{name}.
 
+%files -n %{libobrender}
+%{_libdir}/libobrender.so.%{major}*
+
+#---------------------------------------------------------------------------
+
 %package -n %{libobt}
 Summary:	Libraries from openbox
 Group:		System/Libraries
 Conflicts:	%{_lib}openbox27 < 3.5.0-8
+Obsoletes:	%oldlibobt < %{EVRD}
 
 %description -n %{libobt}
 This package contains a shared library for %{name}.
 
+%files -n %{libobt}
+%{_libdir}/libobt.so.%{obtmajor}*
+
+#---------------------------------------------------------------------------
+
 %package -n %{devname}
 Summary:	Development files from openbox
 Group:		Development/Other
@@ -90,6 +144,13 @@ Provides:	%{name}-devel = %{version}-%{release}
 %description -n %{devname}
 This package includes the development files for %{name}.
 
+%files -n %{devname}
+%{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+%{_includedir}/%{name}
+
+#---------------------------------------------------------------------------
+
 %prep
 %setup -q -a1 -a2
 %autopatch -p1
@@ -97,8 +158,9 @@ autoreconf -fi
 2to3 -w data/autostart/openbox-xdg-autostart tools/themeupdate/themeupdate.py
 
 %build
-%configure --disable-static
-%make_build DEFAULT_MENU=%{_sysconfdir}/xdg/openbox/menu.xml
+%configure
+%make_build \
+	DEFAULT_MENU=%{_sysconfdir}/xdg/openbox/menu.xml
 
 %install
 %make_install
@@ -118,49 +180,8 @@ cat > %{buildroot}%{_bindir}/start%{name} <<EOF
 exec %{_bindir}/openbox-session
 EOF
 
+# insall docs manually
+rm -fr %{buildroot}%{_docdir}/%{name}/{AUTHORS,README}
+# locales
 %find_lang %{name}
 
-%files -f %{name}.lang
-%doc AUTHORS CHANGELOG README
-%doc %{_docdir}/openbox
-%{_bindir}/obxprop
-%{_bindir}/%{name}
-%{_bindir}/openbox-session
-%{_bindir}/startopenbox
-%dir %{_sysconfdir}/xdg/%{name}
-%config(noreplace) %{_sysconfdir}/xdg/%{name}/*
-%{_libexecdir}/openbox-autostart
-%{_libexecdir}/openbox-xdg-autostart
-%{_mandir}/man1/obxprop.1.*
-%{_mandir}/man1/openbox.1.*
-%{_mandir}/man1/openbox-session.1.*
-%{_datadir}/xsessions/openbox.desktop
-
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
-%{_datadir}/themes/*
-
-%files kde
-%{_bindir}/openbox-kde-session
-%{_datadir}/xsessions/openbox-kde.desktop
-%{_mandir}/man1/openbox-kde-session.1.*
-
-%files gnome
-%{_bindir}/gdm-control
-%{_bindir}/gnome-panel-control
-%{_bindir}/openbox-gnome-session
-%{_datadir}/xsessions/openbox-gnome.desktop
-%{_datadir}/gnome-session/sessions/openbox-*.session
-%{_datadir}/gnome/wm-properties/openbox.desktop
-%{_mandir}/man1/openbox-gnome-session.1.*
-
-%files -n %{libobrender}
-%{_libdir}/libobrender.so.%{major}*
-
-%files -n %{libobt}
-%{_libdir}/libobt.so.%{obtmajor}*
-
-%files -n %{devname}
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/*.so
-%{_includedir}/%{name}