Accepting request 515178 from openSUSE:Tools

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/515178
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=120

PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=osc
-pkgver=0.158.0
+pkgver=0.159.0
 pkgrel=0
 pkgdesc="Open Build Service client"
 arch=('i686' 'x86_64')

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">0.158.0</param>
+    <param name="version">0.159.0</param>
-    <param name="revision">0.158.0</param>
+    <param name="revision">0.159.0</param>
     <param name="url">git://github.com/openSUSE/osc.git</param>
     <param name="scm">git</param>
   </service>

appimage.yml

@@ -0,0 +1,32 @@
+app: osc
+
+build:
+  packages:
+    - linuxdeployqt
+
+ingredients:
+  packages:
+    - build
+    - osc
+    - python-yaml
+    - obs-service-obs_scm
+    - obs-service-tar_scm
+    - obs-service-set_version
+    - obs-service-recompress
+    - openSUSE-release
+    - openSUSE-release-ftp
+    - rsync
+    
+script:
+  - mkdir -p $BUILD_APPDIR/usr/share/pixmaps
+  - cp /usr/share/pixmaps/appimage.png $BUILD_APPDIR/usr/share/pixmaps
+  - mkdir -p $BUILD_APPDIR/usr/share/applications
+  - echo "[Desktop Entry]"  >  $BUILD_APPDIR/usr/share/applications/osc.desktop
+  - echo "Name=osc"         >> $BUILD_APPDIR/usr/share/applications/osc.desktop
+  - echo "Exec=osc"         >> $BUILD_APPDIR/usr/share/applications/osc.desktop
+  - echo "Icon=appimage"    >> $BUILD_APPDIR/usr/share/applications/osc.desktop
+  - echo "Type=Application" >> $BUILD_APPDIR/usr/share/applications/osc.desktop
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2
+  - linuxdeployqt $BUILD_APPDIR/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2
+
+

debian.changelog

@@ -1,4 +1,4 @@
-osc (0.158.0) unstable; urgency=low
+osc (0.159.0-0) unstable; urgency=low
   - Install bash completion
 
  -- Nick Brown <brownn@brocade.com>  Wed, 26 Oct 2016 10:00:00 +0200

debian.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c8e1c41d005a8ea80ed34c85a471b28168477f00360224563269723c5b26cc8
+oid sha256:bfca3be53c1750a600df25d7f2d23b61fb26a848a93f657d98516707c4ce7fb6
-size 2222
+size 2210

osc-0.158.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fcd45784843ffb0c4accf1e727c284f32843c52c07a8f197f76ff0f1b27494d
-size 346966

osc-0.159.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a6b3e2f46c7d890075d10c2d3cd06ed09a576c3bce9be2a113c4f6240f11d1a
+size 352175

osc.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Jul 27 22:06:25 UTC 2017 - jberry@suse.com
+
+- Provide non-deprecated plugin directory and macro for plugins.
+
+-------------------------------------------------------------------
+Thu Jul 20 21:18:21 UTC 2017 - adrian@suse.de
+
+- add Recommends: obs-service-obs_scm
+
+-------------------------------------------------------------------
+Tue Jul 18 22:49:23 UTC 2017 - adrian@suse.de
+
+- 0.159.0
+  - "osc buildhistory": show build duration
+  - Support builds using native Docker build descriptions
+  - Support usage of pre-build containers for Docker and KIWI builds
+  - "osc build -M ..": fixed behaviour of falvoured builds
+  - added switch to show only issues in rdiff
+  - show build duration in build history
+  - allow to cat/less files from deleted packages (using -D option)
+  - Allow to override man-page date
+
 -------------------------------------------------------------------
 Tue May  9 07:51:06 UTC 2017 - marco.strigl@suse.com
 

osc.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 0.158.0
+Version: 0.159.0-0
 Binary: osc
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: any

osc.spec

@@ -16,10 +16,12 @@
 #
 
 
-%define version_unconverted 0.158.0
+%define version_unconverted 0.159.0
+%define osc_plugin_dir %{_prefix}/lib/osc-plugins
+%define macros_file macros.osc
 
 Name:           osc
-Version:        0.158.0
+Version:        0.159.0
 Release:        0
 Summary:        Open Build Service Commander
 License:        GPL-2.0+
@@ -59,6 +61,7 @@ Recommends:     powerpc32
 Recommends:     obs-service-recompress
 Recommends:     obs-service-set_version
 Recommends:     obs-service-tar_scm
+Recommends:     obs-service-obs_scm
 Recommends:     obs-service-verify_file
 Recommends:     obs-service-download_files
 Recommends:     obs-service-format_spec_file
@@ -106,9 +109,15 @@ introduction.
 # ("wrong", because no package provides "/bin/python").
 PATH="/usr/bin:$PATH" CFLAGS="%{optflags}" python setup.py build
 
+cat << eom > %{macros_file}
+%%osc_plugin_dir %{osc_plugin_dir}
+eom
+echo >> %{macros_file}
+
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc
+mkdir -p %{buildroot}%{osc_plugin_dir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins
 install -Dm0644 dist/complete.csh %{buildroot}%{_sysconfdir}/profile.d/osc.csh
 %if 0%{?suse_version}
@@ -122,6 +131,8 @@ install -Dm0755 dist/osc.complete %{buildroot}%{_prefix}/lib/osc/complete
 install -Dm0755 dist/osc.complete %{buildroot}%{_libdir}/osc/complete
 %endif
 
+install -m644 %{macros_file} -D %{buildroot}%{_sysconfdir}/rpm/%{macros_file}
+
 %clean
 rm -rf %{buildroot}
 
@@ -136,6 +147,7 @@ rm -rf %{buildroot}
 %else
 %config %{_sysconfdir}/profile.d/osc.sh
 %endif
+%config %{_sysconfdir}/rpm/%{macros_file}
 %dir %{_localstatedir}/lib/osc-plugins
 %{_mandir}/man1/osc.*
 %if 0%{?suse_version} > 1110
@@ -143,5 +155,6 @@ rm -rf %{buildroot}
 %else
 %{_libdir}/osc
 %endif
+%dir %{osc_plugin_dir}
 
 %changelog