Accepting request 723558 from home:tux93:branches:X11:xfce

Renamed Panel Plugin subpackage

OBS-URL: https://build.opensuse.org/request/show/723558
OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-screenshooter?expand=0&rev=50

_service

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="disabled">
+    <param name="url">https://git.xfce.org/apps/xfce4-screenshooter/</param>
+    <param name="scm">git</param>
+    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
+    <param name="changesgenerate">enable</param>
+    <param name="changesauthor">maurizio.galli@gmail.com</param>
+    <param name="versionrewrite-pattern">xfce4screenshooter(.*)</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+  <service name="tar" mode="disabled"/>
+  <service name="recompress" mode="disabled">
+    <param name="compression">gz</param>
+    <param name="file">*.tar</param>
+  </service>
+</services>

xfce4-screenshooter.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 15 13:34:17 UTC 2019 - Marcel Kuehlhorn <tux93@opensuse.org>
+
+- Renamed Panel Plugin subpackage to follow upstream naming
+  xfce4-foo-plugin
+- Added bcond for git master builds
+
 -------------------------------------------------------------------
 Sat Mar 30 21:32:47 UTC 2019 - Vinzenz Vietzke <vinz@vinzv.de>
 

xfce4-screenshooter.spec

@@ -18,6 +18,8 @@
 
 
 %define panel_version 4.12.0
+%define plugin screenshooter
+%bcond_with git
 
 Name:           xfce4-screenshooter
 Version:        1.9.5
@@ -26,7 +28,11 @@ Summary:        Screenshot Tool for the Xfce Desktop
 License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Other
 Url:            https://goodies.xfce.org/projects/applications/xfce4-screenshooter
+%if %{with git}
+Source:         %{name}-%{version}.tar.gz
+%else
 Source:         https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/%{name}-%{version}.tar.bz2
+%endif
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  update-desktop-files
@@ -42,10 +48,13 @@ BuildRequires:  pkgconfig(libxfce4ui-2) >= 4.12.0
 BuildRequires:  pkgconfig(libxfce4util-1.0) >= 4.10.0
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
+%if %{with git}
+BuildRequires:  xfce4-dev-tools
+%endif
 Recommends:     %{name}-lang = %{version}
 # needs xfhelp4
 Requires:       libxfce4ui-tools
-Suggests:       xfce4-panel-plugin-screenshooter
+Suggests:       xfce4-%{plugin}-plugin
 Obsoletes:      xfce4-screenshooter-doc <= 1.8.1
 Provides:       xfce4-screenshooter-doc = %{version}
 
@@ -56,13 +65,17 @@ user-specified delay and the resulting images can be saved to a PNG file,
 copied it to the clipboard, opened with another application, or uploaded to
 ZimageZ, a free online image hosting service.
 
-%package -n xfce4-panel-plugin-screenshooter
+%package -n xfce4-%{plugin}-plugin
 Summary:        Screenshot Plugin for the Xfce Panel
 Group:          System/GUI/XFCE
 Requires:       xfce4-panel >= %{panel_version}
 Requires:       xfce4-screenshooter = %{version}
+# package was renamed in 2019 after Leap 15.1
+Provides:       xfce4-panel-plugin-%{plugin} = %{version}-%{release}
+Obsoletes:      xfce4-panel-plugin-%{plugin} < %{version}-%{release}
+Obsoletes:      xfce4-panel-plugin-%{plugin}-debuginfo
 
-%description -n xfce4-panel-plugin-screenshooter
+%description -n xfce4-%{plugin}-plugin
 This package contains the xfce4-screenshooter Xfce panel plugin.
 
 %lang_package
@@ -71,7 +84,14 @@ This package contains the xfce4-screenshooter Xfce panel plugin.
 %setup -q
 
 %build
-%configure
+%if %{with git}
+NOCONFIGURE=1 ./autogen.sh
+%configure \
+  --enable-maintainer-mode \
+  --disable-static
+%else
+%configure --disable-static
+%endif
 %make_build
 
 %install
@@ -95,7 +115,7 @@ rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/libscreenshooterplugin.la
 %{_datadir}/appdata/xfce4-screenshooter.appdata.xml
 %{_mandir}/man1/xfce4-screenshooter.1*
 
-%files -n xfce4-panel-plugin-screenshooter
+%files -n xfce4-%{plugin}-plugin
 %{_libdir}/xfce4/panel/plugins/libscreenshooterplugin.so
 %{_datadir}/xfce4/panel/plugins/screenshooter.desktop