From 483d3507bbb6d00395a8dbb1fe21db35cdb5eb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Jun 2017 17:34:43 +0000 Subject: [PATCH 1/8] Accepting request 502699 from home:adrianSuSE:branches:openSUSE:Tools add appimage build description OBS-URL: https://build.opensuse.org/request/show/502699 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=243 --- appimage.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 appimage.yml diff --git a/appimage.yml b/appimage.yml new file mode 100644 index 0000000..2f3a2dd --- /dev/null +++ b/appimage.yml @@ -0,0 +1,25 @@ +app: osc + +build: + packages: + - linuxdeployqt + +ingredients: + packages: + - build + - osc + - python-yaml + +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 + + From cbf77fc171d4f6f1ad2561286a86548759f01485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Jun 2017 17:51:23 +0000 Subject: [PATCH 2/8] add mini important service files OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=244 --- appimage.yml | 4 ++++ osc.spec | 2 ++ 2 files changed, 6 insertions(+) diff --git a/appimage.yml b/appimage.yml index 2f3a2dd..26b21e4 100644 --- a/appimage.yml +++ b/appimage.yml @@ -9,6 +9,10 @@ ingredients: - build - osc - python-yaml + - obs-service-obs_scm + - obs-service-tar_scm + - obs-service-set_version + - obs-service-recompress script: - mkdir -p $BUILD_APPDIR/usr/share/pixmaps diff --git a/osc.spec b/osc.spec index 0e883d6..e1239e9 100644 --- a/osc.spec +++ b/osc.spec @@ -27,6 +27,8 @@ Group: Development/Tools/Other Url: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gcc6 +#!BuildIgnore: libgcc_s1 %if 0%{?mandriva_version} < 02010 BuildRequires: python-urlgrabber Requires: python-urlgrabber From 4265a61d5e5182648252e8d915fff6f015f00100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Jun 2017 17:51:53 +0000 Subject: [PATCH 3/8] ups OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=245 --- osc.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/osc.spec b/osc.spec index e1239e9..0e883d6 100644 --- a/osc.spec +++ b/osc.spec @@ -27,8 +27,6 @@ Group: Development/Tools/Other Url: https://github.com/openSUSE/osc Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc6 -#!BuildIgnore: libgcc_s1 %if 0%{?mandriva_version} < 02010 BuildRequires: python-urlgrabber Requires: python-urlgrabber From e3a894dfbc99d16dbe5a03de4fb763a4aecb9cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 9 Jun 2017 17:59:21 +0000 Subject: [PATCH 4/8] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=246 --- appimage.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appimage.yml b/appimage.yml index 26b21e4..41eeafd 100644 --- a/appimage.yml +++ b/appimage.yml @@ -13,6 +13,9 @@ ingredients: - 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 From 71ec70b19a2f09afee22888a6797b34e8a6c1cb7 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Thu, 13 Jul 2017 08:18:01 +0000 Subject: [PATCH 5/8] Accepting request 509034 from home:bluca:branches:openSUSE:Tools Debian: depend on "build | obs-build" Debian and Ubuntu rename build to obs-build to disambiguate. Depend on either (favouring build as it's the upstream name) to be compatible with both. OBS-URL: https://build.opensuse.org/request/show/509034 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=247 --- debian.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.tar.gz b/debian.tar.gz index 2d832d5..26b77c8 100644 --- a/debian.tar.gz +++ b/debian.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c8e1c41d005a8ea80ed34c85a471b28168477f00360224563269723c5b26cc8 -size 2222 +oid sha256:bfca3be53c1750a600df25d7f2d23b61fb26a848a93f657d98516707c4ce7fb6 +size 2210 From fd18b3bec4645802a0f3f9cddf611e48b8ae6a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 18 Jul 2017 22:50:14 +0000 Subject: [PATCH 6/8] version update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=248 --- PKGBUILD | 2 +- _service | 4 ++-- debian.changelog | 2 +- osc-0.158.0.tar.gz | 3 --- osc-0.159.0.tar.gz | 3 +++ osc.changes | 13 +++++++++++++ osc.dsc | 2 +- osc.spec | 4 ++-- 8 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 osc-0.158.0.tar.gz create mode 100644 osc-0.159.0.tar.gz diff --git a/PKGBUILD b/PKGBUILD index a20ace1..e56fa21 100644 --- a/PKGBUILD +++ b/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') diff --git a/_service b/_service index 249eba8..b0a8fa9 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 0.158.0 - 0.158.0 + 0.159.0 + 0.159.0 git://github.com/openSUSE/osc.git git diff --git a/debian.changelog b/debian.changelog index 8c9379c..89df3b4 100644 --- a/debian.changelog +++ b/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 Wed, 26 Oct 2016 10:00:00 +0200 diff --git a/osc-0.158.0.tar.gz b/osc-0.158.0.tar.gz deleted file mode 100644 index a162a47..0000000 --- a/osc-0.158.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fcd45784843ffb0c4accf1e727c284f32843c52c07a8f197f76ff0f1b27494d -size 346966 diff --git a/osc-0.159.0.tar.gz b/osc-0.159.0.tar.gz new file mode 100644 index 0000000..77f1294 --- /dev/null +++ b/osc-0.159.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a6b3e2f46c7d890075d10c2d3cd06ed09a576c3bce9be2a113c4f6240f11d1a +size 352175 diff --git a/osc.changes b/osc.changes index 163d366..20a1057 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 diff --git a/osc.dsc b/osc.dsc index c5a6280..d916094 100644 --- a/osc.dsc +++ b/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 Architecture: any diff --git a/osc.spec b/osc.spec index 0e883d6..6b01066 100644 --- a/osc.spec +++ b/osc.spec @@ -16,10 +16,10 @@ # -%define version_unconverted 0.158.0 +%define version_unconverted 0.159.0 Name: osc -Version: 0.158.0 +Version: 0.159.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0+ From 018d679470b67309e203c19370f9325eeddb92d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 20 Jul 2017 21:18:57 +0000 Subject: [PATCH 7/8] add recommends OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=249 --- osc.changes | 5 +++++ osc.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/osc.changes b/osc.changes index 20a1057..bc69a5f 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/osc.spec b/osc.spec index 6b01066..ab8a0c1 100644 --- a/osc.spec +++ b/osc.spec @@ -59,6 +59,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 From 4dc39b955464c756a70525f17639f00c9ce7f27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20H=C3=BCwe?= Date: Tue, 1 Aug 2017 10:34:44 +0000 Subject: [PATCH 8/8] Accepting request 512849 from home:jberry:release-tools - Provide non-deprecated plugin directory and macro for plugins. OBS-URL: https://build.opensuse.org/request/show/512849 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=250 --- osc.changes | 5 +++++ osc.spec | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/osc.changes b/osc.changes index bc69a5f..5e7b633 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/osc.spec b/osc.spec index ab8a0c1..a1a8291 100644 --- a/osc.spec +++ b/osc.spec @@ -17,6 +17,8 @@ %define version_unconverted 0.159.0 +%define osc_plugin_dir %{_prefix}/lib/osc-plugins +%define macros_file macros.osc Name: osc Version: 0.159.0 @@ -107,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} @@ -123,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} @@ -137,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 @@ -144,5 +155,6 @@ rm -rf %{buildroot} %else %{_libdir}/osc %endif +%dir %{osc_plugin_dir} %changelog