February 2021 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-configuration-management for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-configuration-management for openSUSE:Factory checked in at 2021-02-26 21:58:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-configuration-management (Old) and /work/SRC/openSUSE:Factory/.yast2-configuration-management.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-configuration-management" Fri Feb 26 21:58:28 2021 rev:20 rq:873490 version:4.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-configuration-management/yast2-configuration-management.changes 2020-10-20 16:03:21.417809391 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-configuration-management.new.2378/yast2-configuration-management.changes 2021-02-26 21:58:29.759770473 +0100 @@ -1,0 +2,7 @@ +Thu Feb 18 15:39:36 UTC 2021 - Ancor Gonzalez Sosa <ancor(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.5 + +------------------------------------------------------------------- Old: ---- yast2-configuration-management-4.3.4.tar.bz2 New: ---- yast2-configuration-management-4.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-configuration-management.spec ++++++ --- /var/tmp/diff_new_pack.TkSIQJ/_old 2021-02-26 21:58:30.243770898 +0100 +++ /var/tmp/diff_new_pack.TkSIQJ/_new 2021-02-26 21:58:30.247770902 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-configuration-management # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-configuration-management -Version: 4.3.4 +Version: 4.3.5 Release: 0 URL: https://github.com/yast/yast-migration Summary: YaST2 - YaST Configuration Management ++++++ yast2-configuration-management-4.3.4.tar.bz2 -> yast2-configuration-management-4.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/.github/workflows/ci.yml new/yast2-configuration-management-4.3.5/.github/workflows/ci.yml --- old/yast2-configuration-management-4.3.4/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-configuration-management-4.3.5/.github/workflows/ci.yml 2021-02-18 17:01:02.000000000 +0100 @@ -0,0 +1,85 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Rubocop + run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Package Build + run: yast-ci-ruby -o package + + Yardoc: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Yardoc + run: rake check:doc + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/.travis.yml new/yast2-configuration-management-4.3.5/.travis.yml --- old/yast2-configuration-management-4.3.4/.travis.yml 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-configuration-management-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby -- docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-configuration-management-image yast-travis-ruby -- docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-configuration-management-image rake check:doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/Dockerfile new/yast2-configuration-management-4.3.5/Dockerfile --- old/yast2-configuration-management-4.3.4/Dockerfile 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/README.md new/yast2-configuration-management-4.3.5/README.md --- old/yast2-configuration-management-4.3.4/README.md 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/README.md 2021-02-18 17:01:02.000000000 +0100 @@ -1,7 +1,9 @@ # YaST Configuration Management -[![Build Status](https://travis-ci.org/yast/yast-configuration-management.svg?branch… - https://travis-ci.org/yast/yast-configuration-management) +[![Workflow Status](https://github.com/yast/yast-configuration-management/workflows/CI/… +https://github.com/yast/yast-configuration-management/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-configuratio… +https://ci.opensuse.org/view/Yast/job/yast-yast-configuration-management-master/) [![Coverage Status](https://coveralls.io/repos/github/yast/yast-configuration-management/badge.svg?branch=master)]( https://coveralls.io/github/yast/yast-configuration-management?branch=master) [![Code Climate](https://codeclimate.com/github/yast/yast-configuration-management/… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/package/yast2-configuration-management.changes new/yast2-configuration-management-4.3.5/package/yast2-configuration-management.changes --- old/yast2-configuration-management-4.3.4/package/yast2-configuration-management.changes 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/package/yast2-configuration-management.changes 2021-02-18 17:01:02.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 18 15:39:36 UTC 2021 - Ancor Gonzalez Sosa <ancor(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.5 + +------------------------------------------------------------------- Sat Oct 10 08:47:44 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa(a)suse.com> - Clean-up the libzypp's raw cache before running the finish client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/package/yast2-configuration-management.spec new/yast2-configuration-management-4.3.5/package/yast2-configuration-management.spec --- old/yast2-configuration-management-4.3.4/package/yast2-configuration-management.spec 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/package/yast2-configuration-management.spec 2021-02-18 17:01:02.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-configuration-management -Version: 4.3.4 +Version: 4.3.5 Release: 0 Url: https://github.com/yast/yast-migration Summary: YaST2 - YaST Configuration Management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/spec_helper.rb new/yast2-configuration-management-4.3.5/test/spec_helper.rb --- old/yast2-configuration-management-4.3.4/test/spec_helper.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/spec_helper.rb 2021-02-18 17:01:02.000000000 +0100 @@ -35,16 +35,24 @@ add_filter "/test/" end + src_location = File.expand_path("../src", __dir__) # track all ruby files under src - src_location = File.expand_path("../../src", __FILE__) - SimpleCov.track_files("#{src_location}/{module,lib}/**/*.rb") + SimpleCov.track_files("#{src_location}/**/*.rb") + + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/collection_test.rb new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/collection_test.rb --- old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/collection_test.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/collection_test.rb 2021-02-18 17:01:02.000000000 +0100 @@ -29,7 +29,21 @@ subject(:collection) { described_class.new(spec, controller, locator) } - include_examples "CWM::CustomWidget" + context "with a correct value" do + before do + allow(subject).to receive(:value).and_return [double("item1"), double("item2")] + end + + include_examples "CWM::CustomWidget" + end + + context "with the default value" do + before do + allow(Yast::Report).to receive(:Error) + end + + include_examples "CWM::CustomWidget" + end let(:form_spec) do Y2ConfigurationManagement::Salt::Form.from_file( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/color_test.rb new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/color_test.rb --- old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/color_test.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/color_test.rb 2021-02-18 17:01:02.000000000 +0100 @@ -64,7 +64,13 @@ context "when the current value is not a valid HEX color" do let(:value) { "#ahrdfH" } + it "reports an error" do + expect(Yast::Report).to receive(:Error) + color.validate + end + it "returns false" do + allow(Yast::Report).to receive(:Error) expect(color.validate).to eql(false) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/email_test.rb new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/email_test.rb --- old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/email_test.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/email_test.rb 2021-02-18 17:01:02.000000000 +0100 @@ -59,6 +59,7 @@ end it "returns false" do + allow(Yast::Report).to receive(:Error) expect(email.validate).to eql(false) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/key_value_test.rb new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/key_value_test.rb --- old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/key_value_test.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/key_value_test.rb 2021-02-18 17:01:02.000000000 +0100 @@ -41,7 +41,22 @@ let(:key_widget) { dictionary.send(:key_widget) } let(:value_widget) { dictionary.send(:value_widget) } subject(:dictionary) { described_class.new(spec, locator) } - include_examples "CWM::CustomWidget" + + context "with a valid value" do + before do + allow(key_widget).to receive(:value).and_return "YaST" + end + + include_examples "CWM::CustomWidget" + end + + context "with the initial value" do + before do + allow(Yast::Report).to receive(:Error) + end + + include_examples "CWM::CustomWidget" + end describe "#contents" do it "contains a InputFIeld for the $key and $value" do @@ -117,7 +132,13 @@ context "when the $key input is empty" do let(:key_widget_value) { "" } + it "reports an error" do + expect(Yast::Report).to receive(:Error) + subject.validate + end + it "returns false" do + allow(Yast::Report).to receive(:Error) expect(subject.validate).to eql(false) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/url_test.rb new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/url_test.rb --- old/yast2-configuration-management-4.3.4/test/y2configuration_management/widgets/url_test.rb 2020-10-16 09:58:38.000000000 +0200 +++ new/yast2-configuration-management-4.3.5/test/y2configuration_management/widgets/url_test.rb 2021-02-18 17:01:02.000000000 +0100 @@ -59,6 +59,7 @@ end it "returns false" do + allow(Yast::Report).to receive(:Error) expect(url.validate).to eql(false) end end

1 0

commit yast2-nfs-client for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at 2021-02-26 21:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nfs-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nfs-client.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nfs-client" Fri Feb 26 21:58:27 2021 rev:87 rq:873454 version:4.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nfs-client/yast2-nfs-client.changes 2020-08-14 13:09:10.693206749 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-nfs-client.new.2378/yast2-nfs-client.changes 2021-02-26 21:58:28.523769387 +0100 @@ -1,0 +2,7 @@ +Thu Feb 18 15:16:03 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.3 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-4.3.2.tar.bz2 New: ---- yast2-nfs-client-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.EGi4Jz/_old 2021-02-26 21:58:28.983769792 +0100 +++ /var/tmp/diff_new_pack.EGi4Jz/_new 2021-02-26 21:58:28.987769795 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nfs-client # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yast2-nfs-client -Version: 4.3.2 +Version: 4.3.3 Release: 0 -Url: https://github.com/yast/yast-nfs-client +URL: https://github.com/yast/yast-nfs-client Summary: YaST2 - NFS Configuration License: GPL-2.0-or-later Group: System/YaST ++++++ yast2-nfs-client-4.3.2.tar.bz2 -> yast2-nfs-client-4.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/.github/workflows/ci.yml new/yast2-nfs-client-4.3.3/.github/workflows/ci.yml --- old/yast2-nfs-client-4.3.2/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nfs-client-4.3.3/.github/workflows/ci.yml 2021-02-18 16:22:37.000000000 +0100 @@ -0,0 +1,70 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Rubocop + run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Package Build + run: yast-ci-ruby -o package + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/.travis.yml new/yast2-nfs-client-4.3.3/.travis.yml --- old/yast2-nfs-client-4.3.2/.travis.yml 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-nfs-client-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nfs-client-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/Dockerfile new/yast2-nfs-client-4.3.3/Dockerfile --- old/yast2-nfs-client-4.3.2/Dockerfile 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/README.md new/yast2-nfs-client-4.3.3/README.md --- old/yast2-nfs-client-4.3.2/README.md 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/README.md 2021-02-18 16:22:37.000000000 +0100 @@ -1,7 +1,8 @@ # YaST - The NFS Client Module # -[![Coverage -Status](https://coveralls.io/repos/github/yast/yast-nfs-client/badge.svg?branch=master)](https://coveralls.io/github/yast/yast-nfs-client?branch=master) -[![Travis Build](https://travis-ci.org/yast/yast-nfs-client.svg?branch=master)](https… -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-nfs-clien… - +[![Workflow Status](https://github.com/yast/yast-nfs-client/workflows/CI/badge.svg?bran… +https://github.com/yast/yast-nfs-client/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-nfs-client-m… +https://ci.opensuse.org/view/Yast/job/yast-yast-nfs-client-master/) +[![Coverage Status](https://img.shields.io/coveralls/yast/yast-nfs-client.svg)](https://coveralls.io/r/yast/yast-nfs-client?branch=master) +[![inline docs](http://inch-ci.org/github/yast/yast-nfs-client.svg?branch=master)](ht… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/package/yast2-nfs-client.changes new/yast2-nfs-client-4.3.3/package/yast2-nfs-client.changes --- old/yast2-nfs-client-4.3.2/package/yast2-nfs-client.changes 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/package/yast2-nfs-client.changes 2021-02-18 16:22:37.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 18 15:16:03 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.3 + +------------------------------------------------------------------- Mon Aug 10 17:10:07 CEST 2020 - schubi(a)suse.de - AutoYaST: Added supplements: autoyast(nfs) into the spec file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/package/yast2-nfs-client.spec new/yast2-nfs-client-4.3.3/package/yast2-nfs-client.spec --- old/yast2-nfs-client-4.3.2/package/yast2-nfs-client.spec 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/package/yast2-nfs-client.spec 2021-02-18 16:22:37.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-nfs-client -Version: 4.3.2 +Version: 4.3.3 Release: 0 Url: https://github.com/yast/yast-nfs-client Summary: YaST2 - NFS Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/test/nfs_test.rb new/yast2-nfs-client-4.3.3/test/nfs_test.rb --- old/yast2-nfs-client-4.3.2/test/nfs_test.rb 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/test/nfs_test.rb 2021-02-18 16:22:37.000000000 +0100 @@ -64,7 +64,7 @@ allow(sm).to receive(:probe).and_return true # prevent storage-commit - allow(sm).to receive(:commit) + allow(sm).to receive(:commit).and_return(true) end subject { Yast::Nfs } @@ -258,7 +258,7 @@ allow(Yast::Progress).to receive(:set) allow(Yast::Service).to receive(:Enable) allow(Yast::SCR).to receive(:Execute) - .with(path(".target.mkdir"), anything) + .with(path(".target.mkdir"), anything).and_return(true) allow(Yast::SCR).to receive(:Write) .with(path_matching(/^\.sysconfig\.nfs/), any_args) allow(Yast::SCR).to receive(:Write) @@ -461,7 +461,7 @@ allow(Yast::Progress).to receive(:set) allow(Yast::Service).to receive(:Start) allow(Yast::Service).to receive(:Stop) - allow(Yast::Service).to receive(:active?) + allow(Yast::Service).to receive(:active?).and_return(true) allow(Yast::Execute).to receive(:locally).and_return(execute_object) allow_read_side_effects @@ -485,9 +485,9 @@ .and_return(service_status1, service_status2) end - let(:service_status1) { nil } + let(:service_status1) { true } - let(:service_status2) { nil } + let(:service_status2) { true } context "and the portmapper service is not active" do let(:service_status1) { false } @@ -515,6 +515,10 @@ context "and the portmapper service was not activated" do let(:service_status2) { false } + before do + allow(Yast::Report).to receive(:Error) + end + it "reports an error" do expect(Yast::Report).to receive(:Error).with(/Cannot start/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/test/routines_test.rb new/yast2-nfs-client-4.3.3/test/routines_test.rb --- old/yast2-nfs-client-4.3.2/test/routines_test.rb 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/test/routines_test.rb 2021-02-18 16:22:37.000000000 +0100 @@ -293,6 +293,10 @@ end end context "and does not begin with a slash" do + before do + allow(Yast::Report).to receive(:Error) + end + it "returns false" do expect(subject.CheckPath(path.to_s)).to eq(false) end @@ -304,10 +308,15 @@ end end context "when the given path size is out of the 1..69 range" do + before do + allow(Yast::Report).to receive(:Error) + end + it "reports and error" do expect(Yast::Report).to receive(:Error).with(/The path entered is invalid/) subject.CheckPath("/#{path}/verylong") end + it "returns false" do expect(subject.CheckPath("/#{path}/verylong")).to eq(false) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-4.3.2/test/spec_helper.rb new/yast2-nfs-client-4.3.3/test/spec_helper.rb --- old/yast2-nfs-client-4.3.2/test/spec_helper.rb 2020-08-12 12:07:51.000000000 +0200 +++ new/yast2-nfs-client-4.3.3/test/spec_helper.rb 2021-02-18 16:22:37.000000000 +0100 @@ -28,23 +28,41 @@ require "yast" require "yast/rspec" +RSpec.configure do |config| + config.mock_with :rspec do |mocks| + # If you misremember a method name both in code and in tests, + # will save you. + # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partia… + # + # With graceful degradation for RSpec 2 + mocks.verify_partial_doubles = true if mocks.respond_to?(:verify_partial_doubles=) + end +end + if ENV["COVERAGE"] require "simplecov" - - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" - SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ - SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter - ] + SimpleCov.start do + add_filter "/test/" end + src_location = File.expand_path("../src", __dir__) # track all ruby files under src - src_location = File.expand_path("../../src", __FILE__) SimpleCov.track_files("#{src_location}/**/*.rb") - SimpleCov.start do - add_filter "/test/" + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::LcovFormatter + ] end end

1 0

commit yast2-nis-client for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-nis-client for openSUSE:Factory checked in at 2021-02-26 21:58:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-nis-client (Old) and /work/SRC/openSUSE:Factory/.yast2-nis-client.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-nis-client" Fri Feb 26 21:58:26 2021 rev:77 rq:873366 version:4.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-nis-client/yast2-nis-client.changes 2020-11-23 16:26:54.064570917 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-nis-client.new.2378/yast2-nis-client.changes 2021-02-26 21:58:27.563768544 +0100 @@ -1,0 +2,7 @@ +Wed Feb 17 22:12:29 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.6 + +------------------------------------------------------------------- Old: ---- yast2-nis-client-4.3.5.tar.bz2 New: ---- yast2-nis-client-4.3.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nis-client.spec ++++++ --- /var/tmp/diff_new_pack.4YzUj6/_old 2021-02-26 21:58:28.031768955 +0100 +++ /var/tmp/diff_new_pack.4YzUj6/_new 2021-02-26 21:58:28.031768955 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-nis-client # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Summary: YaST2 - Network Information Services (NIS, YP) Configuration License: GPL-2.0-only Group: System/YaST -Version: 4.3.5 +Version: 4.3.6 Release: 0 URL: https://github.com/yast/yast-nis-client ++++++ yast2-nis-client-4.3.5.tar.bz2 -> yast2-nis-client-4.3.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/.github/workflows/ci.yml new/yast2-nis-client-4.3.6/.github/workflows/ci.yml --- old/yast2-nis-client-4.3.5/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/.github/workflows/ci.yml 2021-02-18 12:59:26.000000000 +0100 @@ -0,0 +1,77 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Rubocop + run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Install Dependencies + run: rake build_dependencies:install + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + + - name: Package Build + run: yast-ci-ruby -o package + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/.travis.yml new/yast2-nis-client-4.3.6/.travis.yml --- old/yast2-nis-client-4.3.5/.travis.yml 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-nis-client-image . -script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp image - # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp - - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-nis-client-image yast-travis-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/Dockerfile new/yast2-nis-client-4.3.6/Dockerfile --- old/yast2-nis-client-4.3.5/Dockerfile 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest -RUN zypper --gpg-auto-import-keys --non-interactive in --no-recommends \ - yast2-testsuite \ - yast2-pam \ - libnsl-devel \ - libtirpc-devel - -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/README.md new/yast2-nis-client-4.3.6/README.md --- old/yast2-nis-client-4.3.5/README.md 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/README.md 2021-02-18 12:59:26.000000000 +0100 @@ -1,5 +1,8 @@ # YaST - The NIS Client Module # -[![Travis Build](https://travis-ci.org/yast/yast-nis-client.svg?branch=master)](https… -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-nis-clien… - +[![Workflow Status](https://github.com/yast/yast-nis-client/workflows/CI/badge.svg?bran… +https://github.com/yast/yast-nis-client/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-nis-client-m… +https://ci.opensuse.org/view/Yast/job/yast-yast-nis-client-master/) +[![Coverage Status](https://img.shields.io/coveralls/yast/yast-nis-client.svg)](https://coveralls.io/r/yast/yast-nis-client?branch=master) +[![inline docs](http://inch-ci.org/github/yast/yast-nis-client.svg?branch=master)](ht… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/package/yast2-nis-client.changes new/yast2-nis-client-4.3.6/package/yast2-nis-client.changes --- old/yast2-nis-client-4.3.5/package/yast2-nis-client.changes 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/package/yast2-nis-client.changes 2021-02-18 12:59:26.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 17 22:12:29 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.6 + +------------------------------------------------------------------- Thu Nov 19 14:39:37 UTC 2020 - Josef Reidinger <jreidinger(a)suse.com> - Do not ask for package installation when CLI help is called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/package/yast2-nis-client.spec new/yast2-nis-client-4.3.6/package/yast2-nis-client.spec --- old/yast2-nis-client-4.3.5/package/yast2-nis-client.spec 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/package/yast2-nis-client.spec 2021-02-18 12:59:26.000000000 +0100 @@ -18,7 +18,7 @@ Name: yast2-nis-client Summary: YaST2 - Network Information Services (NIS, YP) Configuration -Version: 4.3.5 +Version: 4.3.6 Release: 0 Url: https://github.com/yast/yast-nis-client Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/test/nis_test.rb new/yast2-nis-client-4.3.6/test/nis_test.rb --- old/yast2-nis-client-4.3.5/test/nis_test.rb 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/test/nis_test.rb 2021-02-18 12:59:26.000000000 +0100 @@ -9,13 +9,15 @@ allow(Yast::SCR).to receive(:Read) allow(Yast::SCR).to receive(:Write).and_return(true) allow(Yast::SCR).to receive(:Execute).and_return("exit" => 0, "stdout" => "") + allow(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash"), anything) + .and_return(0) allow(Yast::Service).to receive(:Enabled).and_return(false) allow(Yast::Service).to receive(:active?).and_return(false) - allow(Yast::Service).to receive(:Start) - allow(Yast::Service).to receive(:Restart) - allow(Yast::Service).to receive(:Stop) - allow(Yast::Service).to receive(:Enable) - allow(Yast::Service).to receive(:Disable) + allow(Yast::Service).to receive(:Start).and_return(true) + allow(Yast::Service).to receive(:Restart).and_return(true) + allow(Yast::Service).to receive(:Stop).and_return(true) + allow(Yast::Service).to receive(:Enable).and_return(true) + allow(Yast::Service).to receive(:Disable).and_return(true) allow(Yast::Service).to receive(:Status).and_return(0) allow(Y2Firewall::Firewalld.instance).to receive(:read) allow(Yast::Autologin).to receive(:Read) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nis-client-4.3.5/test/test_helper.rb new/yast2-nis-client-4.3.6/test/test_helper.rb --- old/yast2-nis-client-4.3.5/test/test_helper.rb 2020-11-20 10:24:00.000000000 +0100 +++ new/yast2-nis-client-4.3.6/test/test_helper.rb 2021-02-18 12:59:26.000000000 +0100 @@ -33,12 +33,20 @@ # track all ruby files under src SimpleCov.track_files("#{src_location}/**/*.rb") - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end

1 0

commit yast2-samba-server for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-samba-server for openSUSE:Factory checked in at 2021-02-26 21:58:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-server (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-server.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-samba-server" Fri Feb 26 21:58:23 2021 rev:90 rq:873364 version:4.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-server/yast2-samba-server.changes 2020-08-14 13:09:43.133219107 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-samba-server.new.2378/yast2-samba-server.changes 2021-02-26 21:58:25.603766823 +0100 @@ -1,0 +2,7 @@ +Wed Feb 17 20:55:59 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.4 + +------------------------------------------------------------------- Old: ---- yast2-samba-server-4.3.3.tar.bz2 New: ---- yast2-samba-server-4.3.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-server.spec ++++++ --- /var/tmp/diff_new_pack.gVOMs3/_old 2021-02-26 21:58:26.051767216 +0100 +++ /var/tmp/diff_new_pack.gVOMs3/_new 2021-02-26 21:58:26.055767220 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-samba-server # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yast2-samba-server -Version: 4.3.3 +Version: 4.3.4 Release: 0 -Url: https://github.com/yast/yast-samba-server +URL: https://github.com/yast/yast-samba-server Summary: YaST2 - Samba Server Configuration License: GPL-2.0-only Group: System/YaST ++++++ yast2-samba-server-4.3.3.tar.bz2 -> yast2-samba-server-4.3.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/.github/workflows/ci.yml new/yast2-samba-server-4.3.4/.github/workflows/ci.yml --- old/yast2-samba-server-4.3.3/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-samba-server-4.3.4/.github/workflows/ci.yml 2021-02-18 12:56:43.000000000 +0100 @@ -0,0 +1,91 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # workaround issue with missing useradd + - name: Install useradd + run: zypper --non-interactive in shadow + + - name: Install Dependencies + run: rake build_dependencies:install + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # workaround issue with missing useradd + - name: Install useradd + run: zypper --non-interactive in shadow + + - name: Install Dependencies + run: rake build_dependencies:install + + - name: Package Build + run: yast-ci-ruby -o package + + Yardoc: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Yardoc + run: rake check:doc + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # needed for perl checks as we need all perl modules + - name: Install Dependencies + run: rake build_dependencies:install + + - name: Perl Syntax + run: yast-ci-ruby -o perl_syntax + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/.travis.yml new/yast2-samba-server-4.3.4/.travis.yml --- old/yast2-samba-server-4.3.3/.travis.yml 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-samba-server-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it --privileged -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-samba-server-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/Dockerfile new/yast2-samba-server-4.3.4/Dockerfile --- old/yast2-samba-server-4.3.3/Dockerfile 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -RUN zypper --non-interactive in --no-recommends \ - perl-Crypt-SmbHash \ - yast2-samba-client -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/README.md new/yast2-samba-server-4.3.4/README.md --- old/yast2-samba-server-4.3.3/README.md 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/README.md 2021-02-18 12:56:43.000000000 +0100 @@ -1,5 +1,6 @@ # YaST - The Samba Server Module # -[![Travis Build](https://travis-ci.org/yast/yast-samba-server.svg?branch=master)](htt… -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-samba-ser… - +[![Workflow Status](https://github.com/yast/yast-samba-server/workflows/CI/badge.svg?br… +https://github.com/yast/yast-samba-server/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-samba-server… +https://ci.opensuse.org/view/Yast/job/yast-yast-samba-server-master/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/package/yast2-samba-server.changes new/yast2-samba-server-4.3.4/package/yast2-samba-server.changes --- old/yast2-samba-server-4.3.3/package/yast2-samba-server.changes 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/package/yast2-samba-server.changes 2021-02-18 12:56:43.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 17 20:55:59 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.4 + +------------------------------------------------------------------- Tue Aug 11 11:54:32 CEST 2020 - schubi(a)suse.de - AutoYaST: Added supplements: autoyast(samba-server) into the spec file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/package/yast2-samba-server.spec new/yast2-samba-server-4.3.4/package/yast2-samba-server.spec --- old/yast2-samba-server-4.3.3/package/yast2-samba-server.spec 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/package/yast2-samba-server.spec 2021-02-18 12:56:43.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-samba-server -Version: 4.3.3 +Version: 4.3.4 Release: 0 Url: https://github.com/yast/yast-samba-server Summary: YaST2 - Samba Server Configuration diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/test/dialog_complex_test.rb new/yast2-samba-server-4.3.4/test/dialog_complex_test.rb --- old/yast2-samba-server-4.3.3/test/dialog_complex_test.rb 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/test/dialog_complex_test.rb 2021-02-18 12:56:43.000000000 +0100 @@ -171,6 +171,7 @@ context "with connected users" do it "changes action to :reload" do expect(services).to receive(:reload) + allow(Yast::Report).to receive(:Message) samba.WriteDialog end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-server-4.3.3/test/test_helper.rb new/yast2-samba-server-4.3.4/test/test_helper.rb --- old/yast2-samba-server-4.3.3/test/test_helper.rb 2020-08-12 12:17:35.000000000 +0200 +++ new/yast2-samba-server-4.3.4/test/test_helper.rb 2021-02-18 12:56:43.000000000 +0100 @@ -24,21 +24,41 @@ require "yast" +RSpec.configure do |config| + config.mock_with :rspec do |mocks| + # If you misremember a method name both in code and in tests, + # will save you. + # https://relishapp.com/rspec/rspec-mocks/v/3-0/docs/verifying-doubles/partia… + # + # With graceful degradation for RSpec 2 + mocks.verify_partial_doubles = true if mocks.respond_to?(:verify_partial_doubles=) + end +end + if ENV["COVERAGE"] require "simplecov" SimpleCov.start do - # Don't measure coverage of the tests themselves. add_filter "/test/" end + + src_location = File.expand_path("../src", __dir__) # track all ruby files under src - src_location = File.expand_path("../../src", __FILE__) SimpleCov.track_files("#{src_location}/**/*.rb") - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" + + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end

1 0

commit yast2-ntp-client for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-ntp-client for openSUSE:Factory checked in at 2021-02-26 21:58:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ntp-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ntp-client.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ntp-client" Fri Feb 26 21:58:25 2021 rev:124 rq:873365 version:4.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ntp-client/yast2-ntp-client.changes 2020-08-14 13:09:15.121208436 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ntp-client.new.2378/yast2-ntp-client.changes 2021-02-26 21:58:26.431767550 +0100 @@ -1,0 +2,7 @@ +Wed Feb 17 21:19:33 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.2 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-4.3.1.tar.bz2 New: ---- yast2-ntp-client-4.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.GylSYv/_old 2021-02-26 21:58:26.883767947 +0100 +++ /var/tmp/diff_new_pack.GylSYv/_new 2021-02-26 21:58:26.887767951 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ntp-client # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yast2-ntp-client -Version: 4.3.1 +Version: 4.3.2 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0-or-later Group: System/YaST -Url: https://github.com/yast/yast-ntp-client +URL: https://github.com/yast/yast-ntp-client Source0: %{name}-%{version}.tar.bz2 ++++++ yast2-ntp-client-4.3.1.tar.bz2 -> yast2-ntp-client-4.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/.coveralls.yml new/yast2-ntp-client-4.3.2/.coveralls.yml --- old/yast2-ntp-client-4.3.1/.coveralls.yml 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/.coveralls.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -service_name: travis-ci diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/.github/workflows/ci.yml new/yast2-ntp-client-4.3.2/.github/workflows/ci.yml --- old/yast2-ntp-client-4.3.1/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ntp-client-4.3.2/.github/workflows/ci.yml 2021-02-18 12:56:47.000000000 +0100 @@ -0,0 +1,82 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Rubocop: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Rubocop + run: rake check:rubocop + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Package Build + run: yast-ci-ruby -o package + + Yardoc: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Yardoc + run: rake check:doc + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/.travis.yml new/yast2-ntp-client-4.3.2/.travis.yml --- old/yast2-ntp-client-4.3.1/.travis.yml 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-ntp-client-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ntp-client-image yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ntp-client-image rake check:doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/Dockerfile new/yast2-ntp-client-4.3.2/Dockerfile --- old/yast2-ntp-client-4.3.1/Dockerfile 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/README.md new/yast2-ntp-client-4.3.2/README.md --- old/yast2-ntp-client-4.3.1/README.md 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/README.md 2021-02-18 12:56:47.000000000 +0100 @@ -1,6 +1,8 @@ # YaST - The NTP Client Module # -[![Travis Build](https://travis-ci.org/yast/yast-ntp-client.svg?branch=master)](https… -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-ntp-clien… +[![Workflow Status](https://github.com/yast/yast-ntp-client/workflows/CI/badge.svg?bran… +https://github.com/yast/yast-ntp-client/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-ntp-client-m… +https://ci.opensuse.org/view/Yast/job/yast-yast-ntp-client-master/) [![Coverage Status](https://img.shields.io/coveralls/yast/yast-ntp-client.svg)](https://coveralls.io/r/yast/yast-ntp-client?branch=master) - +[![inline docs](http://inch-ci.org/github/yast/yast-ntp-client.svg?branch=master)](ht… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/package/yast2-ntp-client.changes new/yast2-ntp-client-4.3.2/package/yast2-ntp-client.changes --- old/yast2-ntp-client-4.3.1/package/yast2-ntp-client.changes 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/package/yast2-ntp-client.changes 2021-02-18 12:56:47.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 17 21:19:33 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> + +- Adapted unit test to recent changes in Yast::Report (related to + bsc#1179893). +- 4.3.2 + +------------------------------------------------------------------- Mon Aug 10 17:24:06 CEST 2020 - schubi(a)suse.de - AutoYaST: Added supplements: autoyast(ntp-client) into the spec file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/package/yast2-ntp-client.spec new/yast2-ntp-client-4.3.2/package/yast2-ntp-client.spec --- old/yast2-ntp-client-4.3.1/package/yast2-ntp-client.spec 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/package/yast2-ntp-client.spec 2021-02-18 12:56:47.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ntp-client -Version: 4.3.1 +Version: 4.3.2 Release: 0 Summary: YaST2 - NTP Client Configuration License: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/test/test_helper.rb new/yast2-ntp-client-4.3.2/test/test_helper.rb --- old/yast2-ntp-client-4.3.1/test/test_helper.rb 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/test/test_helper.rb 2021-02-18 12:56:47.000000000 +0100 @@ -48,12 +48,20 @@ # track all ruby files under src SimpleCov.track_files("#{src_location}/**/*.rb") - # use coveralls for on-line code coverage reporting at Travis CI - if ENV["TRAVIS"] - require "coveralls" + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ SimpleCov::Formatter::HTMLFormatter, - Coveralls::SimpleCov::Formatter + SimpleCov::Formatter::LcovFormatter ] end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-4.3.1/test/y2ntp_client/widgets/pool_widgets_test.rb new/yast2-ntp-client-4.3.2/test/y2ntp_client/widgets/pool_widgets_test.rb --- old/yast2-ntp-client-4.3.1/test/y2ntp_client/widgets/pool_widgets_test.rb 2020-08-12 12:08:37.000000000 +0200 +++ new/yast2-ntp-client-4.3.2/test/y2ntp_client/widgets/pool_widgets_test.rb 2021-02-18 12:56:47.000000000 +0100 @@ -13,6 +13,11 @@ describe Y2NtpClient::Widgets::TestButton do subject { described_class.new(double(value: "test.ntp.org")) } + before do + # allow test fail in test env + allow(Yast::Report).to receive(:Error) + end + include_examples "CWM::PushButton" end

1 0

commit yast2-ruby-bindings for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-ruby-bindings for openSUSE:Factory checked in at 2021-02-26 21:58:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ruby-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings" Fri Feb 26 21:58:22 2021 rev:107 rq:872744 version:4.3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ruby-bindings/yast2-ruby-bindings.changes 2020-11-23 16:27:55.380686088 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new.2378/yast2-ruby-bindings.changes 2021-02-26 21:58:24.791766110 +0100 @@ -1,0 +2,7 @@ +Mon Feb 15 17:44:17 UTC 2021 - Ladislav Slez��k <lslezak(a)suse.cz> + +- Handle a special keyboard shortcut for starting the installation + console (jsc#PM-1895, jsc#SLE-16263) +- 4.3.12 + +------------------------------------------------------------------- Old: ---- yast2-ruby-bindings-4.3.11.tar.bz2 New: ---- yast2-ruby-bindings-4.3.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Gop2VU/_old 2021-02-26 21:58:25.303766560 +0100 +++ /var/tmp/diff_new_pack.Gop2VU/_new 2021-02-26 21:58:25.307766563 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ruby-bindings # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 4.3.11 +Version: 4.3.12 Release: 0 URL: https://github.com/yast/yast-ruby-bindings BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-ruby-bindings-4.3.11.tar.bz2 -> yast2-ruby-bindings-4.3.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/.github/workflows/ci.yml new/yast2-ruby-bindings-4.3.12/.github/workflows/ci.yml --- old/yast2-ruby-bindings-4.3.11/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/.github/workflows/ci.yml 2021-02-16 10:06:27.000000000 +0100 @@ -0,0 +1,28 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v1 + + - name: Install Dependencies + run: | + # Install tmux to make sure the libyui+YaST integration tests are run + zypper --non-interactive in tmux + # Enable installing docs... + sed -i 's/$rpm\.install\.excludedocs =$.*/\1 no/' /etc/zypp/zypp.conf + # ... and reinstall the RPM containing the examples we use for tests + zypper --non-interactive in --force yast2-ycp-ui-bindings-devel + + - name: Package Build + run: yast-ci-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/.travis.yml new/yast2-ruby-bindings-4.3.12/.travis.yml --- old/yast2-ruby-bindings-4.3.11/.travis.yml 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-ruby-bindings-image . -script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp-tw image - # see https://github.com/yast/docker-yast-cpp-tw/blob/master/yast-travis-cpp - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-ruby-bindings-image yast-travis-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/Dockerfile new/yast2-ruby-bindings-4.3.12/Dockerfile --- old/yast2-ruby-bindings-4.3.11/Dockerfile 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest -# Install tmux to make sure the libyui+YaST integration tests are run -RUN zypper --non-interactive in tmux - -# Enable installing docs... -RUN sed -i 's/$rpm\.install\.excludedocs =$.*/\1 no/' /etc/zypp/zypp.conf -# ... and reinstall the RPM containing the examples we use for tests -RUN zypper --non-interactive in --force yast2-ycp-ui-bindings-devel - -COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/README.md new/yast2-ruby-bindings-4.3.12/README.md --- old/yast2-ruby-bindings-4.3.11/README.md 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/README.md 2021-02-16 10:06:27.000000000 +0100 @@ -1,7 +1,9 @@ -# Yast2-ruby-bindings +# YaST Ruby Bindings -[![Travis Build Status](https://travis-ci.org/yast/yast-ruby-bindings.svg?branch=master)](h… -[![Jenkins Build Status](http://ci.opensuse.org/buildStatus/icon?job=yast-ruby-bindings-mast… +[![Workflow Status](https://github.com/yast/yast-ruby-bindings/workflows/CI/badge.svg?b… +https://github.com/yast/yast-ruby-bindings/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-ruby-binding… +https://ci.opensuse.org/view/Yast/job/yast-yast-ruby-bindings-master/) It is part of [YaST](http://yast.github.io) where you can find more information about YaST and its component system. The Ruby bindings cover only the connection to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-4.3.12/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-4.3.11/package/yast2-ruby-bindings.changes 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/package/yast2-ruby-bindings.changes 2021-02-16 10:06:27.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 15 17:44:17 UTC 2021 - Ladislav Slez��k <lslezak(a)suse.cz> + +- Handle a special keyboard shortcut for starting the installation + console (jsc#PM-1895, jsc#SLE-16263) +- 4.3.12 + +------------------------------------------------------------------- Thu Nov 19 10:13:01 UTC 2020 - Stefan Hundhammer <shundhammer(a)suse.com> - Removed Requires / BuildRequires to libyui (build failure) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-4.3.12/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-4.3.11/package/yast2-ruby-bindings.spec 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/package/yast2-ruby-bindings.spec 2021-02-16 10:06:27.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 4.3.11 +Version: 4.3.12 Release: 0 URL: https://github.com/yast/yast-ruby-bindings BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/src/binary/Builtin.cc new/yast2-ruby-bindings-4.3.12/src/binary/Builtin.cc --- old/yast2-ruby-bindings-4.3.11/src/binary/Builtin.cc 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/src/binary/Builtin.cc 2021-02-16 10:06:27.000000000 +0100 @@ -225,17 +225,14 @@ const char *entropy = NULL; const size_t entropy_len = 0; - char output[CRYPT_GENSALT_OUTPUT_SIZE]; - char* retval = crypt_gensalt_rn (crypt_prefix, crypt_rounds, entropy, - entropy_len, output, sizeof(output)); + char* retval = crypt_gensalt_ra (crypt_prefix, crypt_rounds, entropy, entropy_len); if (!retval) { y2error ("Unable to generate a salt, check your crypt settings.\n"); - return 0; } - return strdup (retval); + return retval; } @@ -273,7 +270,7 @@ } if (!salt) { - y2error ("Cannot create salt for sha512 crypt"); + y2error ("Cannot create salt for crypt type %d", use_crypt); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-4.3.11/src/binary/Yast.cc new/yast2-ruby-bindings-4.3.12/src/binary/Yast.cc --- old/yast2-ruby-bindings-4.3.11/src/binary/Yast.cc 2020-11-19 11:35:39.000000000 +0100 +++ new/yast2-ruby-bindings-4.3.12/src/binary/Yast.cc 2021-02-16 10:06:27.000000000 +0100 @@ -243,6 +243,42 @@ } /** + * Returns true if the input symbol starts special configuration. + * @param val YCPSymbol returned from an UI input call + * @return true/false + */ +static bool is_config_symbol(YCPValue val) +{ + return !val.isNull() && val->isSymbol() && + val->asSymbol()->symbol() == "special_key:config"; +} + +/** + * Returns true if the input is a config UI event. + * @param val YCPMap returned from the UI::WaitForEvent call + * @return true/false + */ +static bool is_config_event(YCPValue val) +{ + // is it a map? + if (val.isNull() || !val->isMap()) + return false; + + YCPMap map = val->asMap(); + + YCPValue event_type = map->value(YCPString("EventType")); + // is map["EventType"] == "SpecialKeyEvent"? + if (event_type.isNull() || !event_type->isString() || + event_type->asString()->value() != "SpecialKeyEvent") + return false; + + YCPValue event_id = map->value(YCPString("ID")); + // is map["ID"] == :"special_key:config"? + return !event_id.isNull() && event_id->isSymbol() && + event_id->asSymbol()->symbol() == "special_key:config"; +} + +/** * Start the Ruby debugger, it calls "Yast::Debugger.start" Ruby code. * See file ../ruby/yast/debugger.rb for more details. */ @@ -257,6 +293,38 @@ rb_funcall(klass, rb_intern("start"), 0); } +static VALUE require_console(...) +{ + rb_require("installation/console"); + return Qtrue; +} + +static VALUE rescue_require_console(...) +{ + y2warning("Loading the console failed!"); + return Qfalse; +} + +/** + * Start the configuration console, it calls "Installation::Console.run" Ruby code. + */ +static void start_config_console() +{ + y2milestone("Starting the configuration console..."); + + // catch the LoadError exception + VALUE success = rb_rescue2( &require_console, Qnil, &rescue_require_console, + Qnil, rb_eLoadError, 0); + + // LoadError caught + if (success == Qfalse) return; + + // call "Installation::Console.run" + VALUE installation = rb_const_get(rb_cObject, rb_intern("Installation")); + VALUE console = rb_const_get(installation, rb_intern("Console")); + rb_funcall(console, rb_intern("run"), 0); +} + /* * call_ycp_function * @@ -353,8 +421,9 @@ rb_funcall(argv[i->first], rb_intern("value="), 1, val); } - // hack: handle the Shift+Ctrl+Alt+D debugging magic key combination - // returned from UI calls, start the Ruby debugger when the magic key is received + // hack: handle the magic key combinations returned from UI calls, + // start the Ruby debugger or the installation console when the respective + // magic key is received if (strcmp(namespace_name, "UI") == 0) { if ( @@ -365,6 +434,18 @@ y2milestone("UI::%s() caught magic debug key: %s", function_name, res->toString().c_str()); start_ruby_debugger(); } + if ( + (ui_input_function(function_name) && is_config_symbol(res)) || + (ui_event_function(function_name) && is_config_event(res)) + ) + { + y2milestone("UI::%s() caught magic config key: %s", function_name, res->toString().c_str()); + start_config_console(); + + // restart the UI call, handle the config event completely internally, + // return a real user input value + return ycp_module_call_ycp_function(argc, argv, self); + } } return ycpvalue_2_rbvalue(res);

1 0

commit libyui-qt-graph for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libyui-qt-graph for openSUSE:Factory checked in at 2021-02-26 21:58:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-graph (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-graph" Fri Feb 26 21:58:21 2021 rev:32 rq:872586 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph-doc.changes 2019-12-14 12:04:30.695392227 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378/libyui-qt-graph-doc.changes 2021-02-26 21:58:23.427764912 +0100 @@ -1,0 +2,7 @@ +Mon Feb 1 14:59:14 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libyui-qt-graph/libyui-qt-graph.changes 2020-10-18 16:21:32.116493868 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-qt-graph.new.2378/libyui-qt-graph.changes 2021-02-26 21:58:23.595765060 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 15:24:07 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-qt (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:13 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Old: ---- libyui-qt-graph-2.46.6.tar.bz2 New: ---- libyui-qt-graph-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-graph-doc.spec ++++++ --- /var/tmp/diff_new_pack.sqIZug/_old 2021-02-26 21:58:24.091765495 +0100 +++ /var/tmp/diff_new_pack.sqIZug/_new 2021-02-26 21:58:24.091765495 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-graph-doc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,63 +17,55 @@ %define parent libyui-qt-graph -%define so_version 14 +%define so_version 15 Name: %{parent}-doc -Version: 2.46.6 -Release: 0 -Source: %{parent}-%{version}.tar.bz2 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 +Release: 0 BuildArch: noarch -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.10 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: graphviz-gnome +BuildRequires: graphviz BuildRequires: libyui-devel >= 3.9.0 -BuildRequires: texlive-latex -URL: http://github.com/libyui/ Summary: Libyui-qt-graph documentation License: LGPL-2.1-only OR LGPL-3.0-only -Group: Documentation/HTML +URL: http://github.com/libyui/ +Source: %{parent}-%{version}.tar.bz2 %description -This package contains the Qt graph -component for libYUI. - +This package contains the Qt graph component for libyui. -This package provides the documentation. (HTML & PDF) +This package provides HTML class documentation. %prep - %setup -n %{parent}-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./bootstrap.sh %{_prefix} - mkdir build cd build + cmake .. \ - -DDOC_DIR=%{_docdir} \ - -DDOCS_ONLY=ON + -DBUILD_DOC=on \ + -DBUILD_SRC=off \ + -DDOC_DESTDIR=$RPM_BUILD_ROOT -make %{?jobs:-j%jobs} docs +# No "make doc" here: This would only duplicate the doxygen call %install -cd build -make install DESTDIR="$RPM_BUILD_ROOT" -%fdupes -s $RPM_BUILD_ROOT/%_docdir/%{parent}%{so_version} +cd build +make install-doc +# This implicitly includes "make doc" unconditionally -%clean -rm -rf "$RPM_BUILD_ROOT" +%fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version} %files %defattr(-,root,root) ++++++ libyui-qt-graph.spec ++++++ --- /var/tmp/diff_new_pack.sqIZug/_old 2021-02-26 21:58:24.107765509 +0100 +++ /var/tmp/diff_new_pack.sqIZug/_new 2021-02-26 21:58:24.111765513 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-graph # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,69 +17,68 @@ Name: libyui-qt-graph -Version: 2.46.6 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Source: %{name}-%{version}.tar.bz2 -%define so_version 14 +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.9.0 +%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 %define bin_name %{name}%{so_version} -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ BuildRequires: graphviz-devel >= 2.26.0 -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libyui-devel >= 3.9.0 -%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 +# Used here and in src/CMakeLists.txt +BuildRequires: pkg-config + +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) + +BuildRequires: %{libyui_devel_version} BuildRequires: %{libyui_qt_devel_version} -URL: http://github.com/libyui/ Summary: Libyui - Qt Graph Widget License: LGPL-2.1-only OR LGPL-3.0-only -Group: System/Libraries +URL: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 %description -This package contains the Qt graph -component for libYUI. +This package contains the Qt graph component for libyui. %package -n %{bin_name} - +Summary: Libyui - Qt graph widget Requires: libyui%{so_version} +Requires: libyui-qt%{so_version} Supplements: libyui-qt%{so_version} Provides: %{name} = %{version} Provides: yast2-qt-graph = 2.46.0 Obsoletes: yast2-qt-graph < 2.46.0 -URL: http://github.com/libyui/ -Summary: Libyui - Qt Graph Widget -Group: System/Libraries - %description -n %{bin_name} -This package contains the Qt graph -component for libYUI. +This package contains the Qt graph component for libyui. +This is a special widget to visualize graphs such as the +storage device hierarchy (disks, partitions, subvolumes +etc.). and similar graphviz-generated graphs. %package devel - +Summary: Libyui - Header files for the Qt graph widget Requires: %{bin_name} = %{version} Requires: %{libyui_qt_devel_version} -URL: http://github.com/libyui/ -Summary: Libyui-qt-graph header files -Group: Development/Languages/C and C++ - %description devel -This package contains the Qt graph -component for libYUI. - - -This can be used independently of YaST for generic (C++) applications. -This package has very few dependencies. +This package contains the header files for the Qt graph component +for libyui. %prep @@ -90,39 +89,31 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} - mkdir build cd build %if %{?_with_debug:1}%{!?_with_debug:0} -cmake .. \ - -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" +%endif + cmake .. \ - -DYPREFIX=%{_prefix} \ -DDOC_DIR=%{_docdir} \ -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELEASE -%endif + -DBUILD_EXAMPLES=on \ + $CMAKE_OPTS make %{?jobs:-j%jobs} %install cd build make install DESTDIR="$RPM_BUILD_ROOT" -install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ -%clean -rm -rf "$RPM_BUILD_ROOT" - %post -n %{bin_name} -p /sbin/ldconfig - %postun -n %{bin_name} -p /sbin/ldconfig %files -n %{bin_name} @@ -134,11 +125,9 @@ %files devel %defattr(-,root,root) -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_prefix}/include/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/qt-graph +%dir %{_docdir}/%{bin_name} %doc %{_docdir}/%{bin_name}/examples %changelog ++++++ libyui-qt-graph-2.46.6.tar.bz2 -> libyui-qt-graph-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/CMakeLists.txt new/libyui-qt-graph-4.0.1/CMakeLists.txt --- old/libyui-qt-graph-2.46.6/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-graph-4.0.1/CMakeLists.txt 2021-02-15 16:42:21.000000000 +0100 @@ -0,0 +1,66 @@ +# CMakeLists.txt for libyui-qt-graph +# +# Usage: +# +# mkdir build +# cd build +# cmake .. +# +# make +# sudo make install +# +# Restart with a clean build environment: +# rm -rf build +# +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +cmake_minimum_required( VERSION 3.10 ) +project( libyui-qt-graph ) + +# Options usage: +# +# cmake -DBUILD_DOC=on -DBUILD_EXAMPLES=off .. + +option( BUILD_SRC "Build in src/ subdirectory" on ) +option( BUILD_EXAMPLES "Build C++ -based libyui examples" off ) +option( BUILD_DOC "Build class documentation" off ) +option( WERROR "Treat all compiler warnings as errors" on ) + +# Non-boolean options +set( DOC_DESTDIR "" CACHE STRING "Destination directory prefix for installing docs" ) + +#---------------------------------------------------------------------- + + +# As of now, no support for /usr/local instead of /usr. But CMake DESTDIR works. +set( CMAKE_INSTALL_PREFIX /usr ) + +set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make install" + + +# Initialize compiler flags for all targets in all subdirectories +add_compile_options( "-Wall" ) +add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds) + +if ( WERROR ) + add_compile_options( "-Werror" ) +endif() + + +# +# Descend into subdirectories +# + +if ( BUILD_SRC ) + add_subdirectory( src ) +endif() + +if ( BUILD_EXAMPLES ) + add_subdirectory( examples ) +endif() + +if ( BUILD_DOC ) + # Notice that this is only built upon "make doc" and installed upon "make install-doc" + add_subdirectory( doc ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Libyui-qt-graphLibgvc.cmake new/libyui-qt-graph-4.0.1/Libyui-qt-graphLibgvc.cmake --- old/libyui-qt-graph-2.46.6/Libyui-qt-graphLibgvc.cmake 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/Libyui-qt-graphLibgvc.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# find the correct libraries depending on libgvc's version - -MACRO( SET_LIBGVS_LIBS ) - EXECUTE_PROCESS(COMMAND /usr/bin/pkg-config --libs libgvc - RESULT_VARIABLE _exit - OUTPUT_VARIABLE _tmp - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - IF(${_exit} GREATER 0 AND NOT ${DOCS_ONLY}) - MESSAGE(FATAL_ERROR "Install graphviz-devel") - ENDIF() - STRING(REPLACE "-l" "" _tmp "${_tmp}") - SEPARATE_ARGUMENTS(_tmp) - SET( LIB_LINKER ${_tmp} ) -ENDMACRO( SET_LIBGVS_LIBS ) - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/MAINTAINER new/libyui-qt-graph-4.0.1/MAINTAINER --- old/libyui-qt-graph-2.46.6/MAINTAINER 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/MAINTAINER 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Arvin Schnell <aschnell(a)suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Makefile.cvs new/libyui-qt-graph-4.0.1/Makefile.cvs --- old/libyui-qt-graph-2.46.6/Makefile.cvs 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -# -# Makefile.cvs -# - -all: configure - -configure: clean - ./bootstrap.sh ; \ - mkdir build ; \ - cd build ; \ - cmake .. \ - -DENABLE_WERROR=OFF \ - -DCMAKE_BUILD_TYPE=RELEASE - -install: configure - cd build ; \ - make && make install - -reconf: - cd build ; \ - cmake rebuild_cache - -clean: - rm -rf build \ - CMakeLists.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Makefile.repo new/libyui-qt-graph-4.0.1/Makefile.repo --- old/libyui-qt-graph-2.46.6/Makefile.repo 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-graph-4.0.1/Makefile.repo 2021-02-15 16:42:21.000000000 +0100 @@ -0,0 +1,63 @@ +# +# Makefile.repo for libyui-qt-graph +# + +# Local Variables: +# mode: Makefile +# End: + + +all: clean configure build-hint + +build-hint: + @echo "" + @echo "To build:" + @echo "" + @echo " cd build" + @echo " make" + @echo "" + +configure: + mkdir build; \ + cd build; \ + cmake .. + +build: clean configure + cd build; \ + make -j $$(nproc) + +# This needs root privileges, of course +install: configure + cd build; \ + make -j $$(nproc) && make install + +clean: + rm -rf build + +package: + rake package + +doc: + test -d build || mkdir build + cd build; \ + cmake -DBUILD_DOC=on .. ; \ + make doc + +install-doc: doc + cd build; \ + make install-doc + +version-bump: + rake version:bump + +# Just an alias +bump-version: version-bump + + +# Enforce rebuilding some targets unconditionally, even if a file or directory +# with that name exists; otherwise the timestamp of that file or directory +# would be checked. +# +# We need this because we have a subdirectory doc/, a subdirectory package/ +# and possibly a subdirectory build/ here. +.PHONY: doc package build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/PROJECTINFO.cmake new/libyui-qt-graph-4.0.1/PROJECTINFO.cmake --- old/libyui-qt-graph-2.46.6/PROJECTINFO.cmake 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/PROJECTINFO.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -##### PROJECTINFO for CMake - -SET( BASELIB "yui" ) # don't change this - -##### MAKE ALL NEEDED CHANGES HERE ##### - -SET( SUBDIRS src examples ) # set the subdirs where your code is located. -SET( PLUGINNAME qt-graph ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph} -SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets Qt5Svg Qt5X11Extras ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line -SET( INTERNAL_DEPS Libyui Libyui-qt ) # include libyui or it's plugins (if needed), too! -#SET( LIB_LINKER gvc graph cdt) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! -SET( EXTRA_INCLUDES /usr/include/graphviz ) # set include-dir which are not picked by CMake automagically here. -SET( PROGSUBDIR ) # define your programm's name if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg. - - -SET( URL "http://github.com/libyui/" ) -SET( SUMMARY "Libyui - Qt Graph Widget" ) -SET( DESCRIPTION "This package contains the Qt graph \ncomponent for libYUI.\n" ) - - -INCLUDE( "${CMAKE_SOURCE_DIR}/Libyui-qt-graphLibgvc.cmake" ) -SET_LIBGVS_LIBS() - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/RPMINFO.cmake new/libyui-qt-graph-4.0.1/RPMINFO.cmake --- old/libyui-qt-graph-2.46.6/RPMINFO.cmake 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/RPMINFO.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -##### RPMINFO for CMake -##### -##### THIS IS THE INFO REQUIRED FOR SPEC-FILE GENERATION - -SET( SPEC_Url "http://github.com/libyui-qt-graph/" ) # the URL of the project - -SET( SPEC_Summary "Libyui - graph widget for the Qt UI" ) # some brief summary - -SET( SPEC_Description - "This is the graph widget plugin provided for the libyui Qt UI\n" ) # the description to be used, end each line with "\n" for line-breaks - -SET( SPEC_BuildRequires "cmake >= 2.8" "gcc-c++" "doxygen" "libqt4-devel" - "libyui-devel" - "libyui-qt-devel >= 2.21.6" - "libzypp-devel >= 11.4.0" -) # the BuildRequires every single pkg wrapped with "" and speparated with spaces - -SET( SPEC_Requires "" ) # the Requires every single pkg wrapped with "" and speparated with spaces - -SET( SPEC_Provides "yast2-qt-graph = 2.21.25" ) # the Provides every single pkg wrapped with "" and speparated with spaces - -SET( SPEC_Obsoletes "yast2-qt-graph < 2.21.25" ) # the Obsoletes every single pkg wrapped with "" and speparated with spaces - -SET( SPEC_Conflicts "" ) # the Conflicts every single pkg wrapped with "" and speparated with spaces - -SET( SPEC_Docs "" ) # for docs that should be in the main-pkg - -SET( SPEC_DEVEL_Requires "@PROJECTNAME@@@varpfx@SONAME_MAJOR@ = %{version}" - "libyui-qt-devel >= 2.21.6" -) # the Requires for the -devel pkg every single pkg wrapped with "" and speparated with spaces - -#SET( SPEC_DEVEL_Provides "pkgconfig(@PROJECTNAME@) = %{version}" -# "yast2_ui_pkg" -#) # the Provides for the -devel pkg - -SET( SPEC_DEVEL_Docs "" ) # for docs that should be in the devel-pkg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/Rakefile new/libyui-qt-graph-4.0.1/Rakefile --- old/libyui-qt-graph-2.46.6/Rakefile 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/Rakefile 2021-02-15 16:42:21.000000000 +0100 @@ -1,8 +1,16 @@ #-- -# Copyright (C) 2015 SUSE LLC +# Copyright (c) 2015-2019 SUSE LLC +# Copyright (c) 2020-2021 SUSE LLC # # make continuous integration using rubygem-libyui-rake. # # MIT license #++ require "libyui/rake" + +Libyui::Tasks.configuration do |conf| + include Libyui::Tasks::Helpers + + conf.skip_license_check << /^Makefile\.repo$/ + conf.skip_license_check << /CMakeLists\.txt$/ +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/SOURCECONF.cmake new/libyui-qt-graph-4.0.1/SOURCECONF.cmake --- old/libyui-qt-graph-2.46.6/SOURCECONF.cmake 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/SOURCECONF.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -SET( ${TARGETLIB}_SOURCES - ##### Here go the source files - QY2Graph.cc - YQGraph.cc - YQGraphPlugin.cc - YQGraphPluginImpl.cc -) - -SET( ${TARGETLIB}_HEADERS - ##### Here go the headers - QY2Graph.h - YQGraph.h - YQGraphPlugin.h - YQGraphPluginImpl.h -) - -SET( EXAMPLES_LIST - ##### Here go the examples - SimpleCreate.cc - SimpleLoad.cc -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/VERSION.cmake new/libyui-qt-graph-4.0.1/VERSION.cmake --- old/libyui-qt-graph-2.46.6/VERSION.cmake 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/VERSION.cmake 2021-02-15 16:42:21.000000000 +0100 @@ -1,11 +1,9 @@ -SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "46") -SET(VERSION_PATCH "6") +SET( VERSION_MAJOR "4") +SET( VERSION_MINOR "0" ) +SET( VERSION_PATCH "1" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -##### This is need for the libyui core ONLY. -##### These will be overridden from exports in LibyuiConfig.cmake -SET( SONAME_MAJOR "0" ) +SET( SONAME_MAJOR "15" ) SET( SONAME_MINOR "0" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/bootstrap.sh new/libyui-qt-graph-4.0.1/bootstrap.sh --- old/libyui-qt-graph-2.46.6/bootstrap.sh 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/bin/sh -set -e - -prefix="/usr" - -if [ ! -z $1 ] -then - prefix="$1" -fi - -cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common" -cmake_target="./CMakeLists.txt" - -echo "checking for $cmake_common..." - -if [ -f "$cmake_common" ] -then - ln -fs "$cmake_common" "$cmake_target" - echo "OK: linked to `pwd`/$cmake_target." -else - echo " Use must have libyui(-devel) >= 3.0.4 installed" - echo " in \"$prefix\" first !!!" - exit 1 -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/doc/CMakeLists.txt new/libyui-qt-graph-4.0.1/doc/CMakeLists.txt --- old/libyui-qt-graph-2.46.6/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-graph-4.0.1/doc/CMakeLists.txt 2021-02-15 16:42:21.000000000 +0100 @@ -0,0 +1,42 @@ +# CMakeLists.txt for libyui-qt-graph/doc + +include( ../VERSION.cmake ) + +find_package( Doxygen REQUIRED dot ) + + +set( PKG_NAME libyui-qt-graph${SONAME_MAJOR} ) +set( DOC_INSTALL_DIR ${DOC_DESTDIR}/usr/share/doc/packages/${PKG_NAME} ) + + +# +# Doxygen-generated autodocs +# + +if ( DOXYGEN_FOUND ) + + set( DOXYGEN_GENERATE_TREEVIEW yes ) # Enable views tree HTML frame + set( DOXYGEN_QUIET yes ) # Less verbose output + set( DOXYGEN_WARN_LOGFILE doxygen-warnings.log ) + # See build/CMakeDoxyfile.in for more supported variables + + doxygen_add_docs( doc ../src ) + +else() + message( WARNING "Missing doxygen package" ) +endif() + + +# Define a new custom make target "install-doc". +# Notice that we can't use DESTDIR here since CMake only sets that +# for "make install", not for this custom "make install-doc". +# https://gist.github.com/shundhammer/12b6343309544a5920f51cd0063eeecf + +add_custom_target( install-doc + DEPENDS doc + + COMMAND mkdir -m 755 -p ${DOC_INSTALL_DIR}/html + COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/html ${DOC_INSTALL_DIR} + + COMMENT "Installing documentation to ${DOC_INSTALL_DIR}" ) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/examples/CMakeLists.txt new/libyui-qt-graph-4.0.1/examples/CMakeLists.txt --- old/libyui-qt-graph-2.46.6/examples/CMakeLists.txt 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/examples/CMakeLists.txt 2021-02-15 16:42:21.000000000 +0100 @@ -1 +1,42 @@ -PROCESS_EXAMPLES() +# CMakeLists.txt for libyui-qt-graph/examples + +include( ../VERSION.cmake ) +include( FindPkgConfig ) # pkg_check_modules() + +set( PKG_NAME libyui-qt-graph${SONAME_MAJOR} ) +set( EXAMPLES_INSTALL_DIR ${DESTDIR}/usr/share/doc/packages/${PKG_NAME}/examples ) + + +# Check for the libgvc (from the libgraphviz package) via pkg-config; +# this sets LIBGVC_LIBRARIES (and more). +pkg_check_modules( LIBGVC REQUIRED libgvc ) + + +set( EXAMPLES_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include ) + +# Symlink ../../libyui/src to build/examples/include/yui +# so the headers there can be included as <yui/YFoo.h> +add_custom_target( examples-include-dir + COMMAND rm -rf ${EXAMPLES_INCLUDE_DIR} + COMMAND mkdir ${EXAMPLES_INCLUDE_DIR} + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src ${EXAMPLES_INCLUDE_DIR}/yui ) + + +# Build a simple example named EXAMPLE from one source file EXAMPLE.cc +# and install the source to the package's doc directory +# +function( add_example EXAMPLE ) + add_executable( ${EXAMPLE} ${EXAMPLE}.cc ) + target_link_libraries( ${EXAMPLE} yui ${LIBGVC_LIBRARIES} ) + add_dependencies( ${EXAMPLE} libyui-qt-graph examples-include-dir ) + + # Prefer the headers in ../../libyui/src over those in /usr/include + target_include_directories( ${EXAMPLE} BEFORE PUBLIC ${EXAMPLES_INCLUDE_DIR} ) + + install( FILES ${EXAMPLE}.cc DESTINATION ${EXAMPLES_INSTALL_DIR} ) +endfunction() + +#---------------------------------------------------------------------- + +add_example( SimpleCreate ) +add_example( SimpleLoad ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/examples/SimpleCreate.cc new/libyui-qt-graph-4.0.1/examples/SimpleCreate.cc --- old/libyui-qt-graph-2.46.6/examples/SimpleCreate.cc 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/examples/SimpleCreate.cc 2021-02-15 16:42:21.000000000 +0100 @@ -21,14 +21,14 @@ #include <string.h> #include <graphviz/gvc.h> -#include "yui/YUI.h" -#include "yui/YWidgetFactory.h" -#include "yui/YOptionalWidgetFactory.h" -#include "yui/YDialog.h" -#include "yui/YLayoutBox.h" -#include "yui/YGraph.h" -#include "yui/YPushButton.h" -#include "yui/YEvent.h" +#include <yui/YUI.h> +#include <yui/YWidgetFactory.h> +#include <yui/YOptionalWidgetFactory.h> +#include <yui/YDialog.h> +#include <yui/YLayoutBox.h> +#include <yui/YGraph.h> +#include <yui/YPushButton.h> +#include <yui/YEvent.h> int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/examples/SimpleLoad.cc new/libyui-qt-graph-4.0.1/examples/SimpleLoad.cc --- old/libyui-qt-graph-2.46.6/examples/SimpleLoad.cc 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/examples/SimpleLoad.cc 2021-02-15 16:42:21.000000000 +0100 @@ -20,14 +20,14 @@ #include <iostream> -#include "yui/YUI.h" -#include "yui/YWidgetFactory.h" -#include "yui/YOptionalWidgetFactory.h" -#include "yui/YDialog.h" -#include "yui/YLayoutBox.h" -#include "yui/YGraph.h" -#include "yui/YPushButton.h" -#include "yui/YEvent.h" +#include <yui/YUI.h> +#include <yui/YWidgetFactory.h> +#include <yui/YOptionalWidgetFactory.h> +#include <yui/YDialog.h> +#include <yui/YLayoutBox.h> +#include <yui/YGraph.h> +#include <yui/YPushButton.h> +#include <yui/YEvent.h> int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.changes new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.changes --- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.changes 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.changes 2021-02-15 16:42:21.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 1 14:59:14 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Wed Dec 11 10:28:02 UTC 2019 - Rodion Iafarov <riafarov(a)suse.com> - Increase SO version to 11 (bsc#1132247) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.spec new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.spec --- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph-doc.spec 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph-doc.spec 2021-02-15 16:42:21.000000000 +0100 @@ -1,7 +1,8 @@ # # spec file for package libyui-qt-graph-doc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014-2019 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,64 +17,59 @@ # -%define parent libyui-qt-graph -%define so_version 14 +%define parent libyui-qt-graph +%define so_version 15 Name: %{parent}-doc -Version: 2.46.6 -Release: 0 -Source: %{parent}-%{version}.tar.bz2 +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 +Release: 0 BuildArch: noarch -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.10 BuildRequires: doxygen +BuildRequires: graphviz BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: graphviz-gnome BuildRequires: libyui-devel >= 3.9.0 -BuildRequires: texlive-latex -Url: http://github.com/libyui/ Summary: Libyui-qt-graph documentation +Url: http://github.com/libyui/ License: LGPL-2.1 or LGPL-3.0 -Group: Documentation/HTML +Source: %{parent}-%{version}.tar.bz2 %description -This package contains the Qt graph -component for libYUI. - +This package contains the Qt graph component for libyui. -This package provides the documentation. (HTML & PDF) +This package provides HTML class documentation. %prep - %setup -n %{parent}-%{version} -%build - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} +%build mkdir build cd build + cmake .. \ - -DDOC_DIR=%{_docdir} \ - -DDOCS_ONLY=ON + -DBUILD_DOC=on \ + -DBUILD_SRC=off \ + -DDOC_DESTDIR=$RPM_BUILD_ROOT + +# No "make doc" here: This would only duplicate the doxygen call -make %{?jobs:-j%jobs} docs %install + cd build -make install DESTDIR="$RPM_BUILD_ROOT" +make install-doc +# This implicitly includes "make doc" unconditionally -%fdupes -s $RPM_BUILD_ROOT/%_docdir/%{parent}%{so_version} +%fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version} -%clean -rm -rf "$RPM_BUILD_ROOT" %files %defattr(-,root,root) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.changes new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.changes --- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.changes 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.changes 2021-02-15 16:42:21.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Mon Feb 15 15:24:07 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-qt (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:13 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Fri Oct 9 13:16:59 UTC 2020 - Jos�� Iv��n L��pez Gonz��lez <jlopez(a)suse.com> - Use new parent lib SO version libyui.so.14 (bsc#1176402). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.spec new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.spec --- old/libyui-qt-graph-2.46.6/package/libyui-qt-graph.spec 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/package/libyui-qt-graph.spec 2021-02-15 16:42:21.000000000 +0100 @@ -1,7 +1,8 @@ # # spec file for package libyui-qt-graph # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014-2019 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,114 +18,111 @@ Name: libyui-qt-graph -Version: 2.46.6 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Source: %{name}-%{version}.tar.bz2 -%define so_version 14 -%define bin_name %{name}%{so_version} +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.9.0 +%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 +%define bin_name %{name}%{so_version} -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ BuildRequires: graphviz-devel >= 2.26.0 -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libyui-devel >= 3.9.0 -%define libyui_qt_devel_version libyui-qt-devel >= 2.52.0 +# Used here and in src/CMakeLists.txt +BuildRequires: pkg-config + +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Svg) + BuildRequires: %{libyui_qt_devel_version} +BuildRequires: %{libyui_devel_version} -Url: http://github.com/libyui/ Summary: Libyui - Qt Graph Widget License: LGPL-2.1 or LGPL-3.0 -Group: System/Libraries +Url: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 %description -This package contains the Qt graph -component for libYUI. +This package contains the Qt graph component for libyui. %package -n %{bin_name} - +Summary: Libyui - Qt graph widget Requires: libyui%{so_version} +Requires: libyui-qt%{so_version} Supplements: libyui-qt%{so_version} Provides: %{name} = %{version} Provides: yast2-qt-graph = 2.46.0 Obsoletes: yast2-qt-graph < 2.46.0 -Url: http://github.com/libyui/ -Summary: Libyui - Qt Graph Widget -Group: System/Libraries %description -n %{bin_name} -This package contains the Qt graph -component for libYUI. +This package contains the Qt graph component for libyui. +This is a special widget to visualize graphs such as the +storage device hierarchy (disks, partitions, subvolumes +etc.). and similar graphviz-generated graphs. %package devel - -Requires: %{libyui_qt_devel_version} +Summary: Libyui - Header files for the Qt graph widget Requires: %{bin_name} = %{version} +Requires: %{libyui_qt_devel_version} -Url: http://github.com/libyui/ -Summary: Libyui-qt-graph header files -Group: Development/Languages/C and C++ %description devel -This package contains the Qt graph -component for libYUI. - - -This can be used independently of YaST for generic (C++) applications. -This package has very few dependencies. +This package contains the header files for the Qt graph component +for libyui. %prep %setup -q -n %{name}-%{version} + %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} - mkdir build cd build %if %{?_with_debug:1}%{!?_with_debug:0} -cmake .. \ - -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else -cmake .. \ - -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ - -DCMAKE_BUILD_TYPE=RELEASE +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" %endif +cmake .. \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + -DBUILD_EXAMPLES=on \ + $CMAKE_OPTS + make %{?jobs:-j%jobs} + %install cd build make install DESTDIR="$RPM_BUILD_ROOT" -install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ -%clean -rm -rf "$RPM_BUILD_ROOT" %post -n %{bin_name} -p /sbin/ldconfig - %postun -n %{bin_name} -p /sbin/ldconfig + %files -n %{bin_name} %defattr(-,root,root) %dir %{_libdir}/yui @@ -132,13 +130,12 @@ %doc %dir %{_docdir}/%{bin_name} %license %{_docdir}/%{bin_name}/COPYING* + %files devel %defattr(-,root,root) -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_prefix}/include/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/qt-graph +%dir %{_docdir}/%{bin_name} %doc %{_docdir}/%{bin_name}/examples %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/CMakeLists.txt new/libyui-qt-graph-4.0.1/src/CMakeLists.txt --- old/libyui-qt-graph-2.46.6/src/CMakeLists.txt 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/CMakeLists.txt 2021-02-15 16:42:21.000000000 +0100 @@ -1,11 +1,137 @@ -# Find includes in corresponding build directories -set(CMAKE_INCLUDE_CURRENT_DIR ON) -# Instruct CMake to run moc automatically when needed. -set(CMAKE_AUTOMOC ON) - -set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH}) - -PROCESS_SOURCES() -target_link_libraries( - ${TARGETLIB} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::X11Extras +# CMakeLists.txt for libyui-qt-pkg/src + +include( ../VERSION.cmake ) +include( GNUInstallDirs ) # set CMAKE_INSTALL_INCLUDEDIR, ..._LIBDIR +include( FindPkgConfig ) # pkg_check_modules() + +# Check for Qt +find_package( Qt5 COMPONENTS Widgets REQUIRED ) +set( CMAKE_AUTOMOC on ) # Automatically handle "moc" preprocessor (Q_OBJECTs) + +# Check for libgvc (from the libgraphviz package) via pkg-config; +# this sets LIBGVC_LIBRARIES (and more). +pkg_check_modules( LIBGVC REQUIRED libgvc ) +message( "-- Graphviz libs: ${LIBGVC_LIBRARIES}" ) + + +# +# libyui plugin specific +# + +set( TARGETLIB libyui-qt-graph ) +set( TARGETLIB_BASE yui-qt-graph ) + +set( HEADERS_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/yui/qt-graph ) +set( PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/yui ) # /usr/lib64/yui + +# if DESTDIR is set, CMAKE_INSTALL_INCLUDEDIR already contains it +# during "make install" (but not for other make targets!): +# +# sudo make install DESTDIR=/work/foo +# or +# DESTDIR=/work/foo sudo make install +# +# -> the include files are installed to /work/foo/usr/include/... +# We need that for RPM builds to install everything to $RPM_BUILD_ROOT. + + +set( SOURCES + YQGraph.cc + YQGraphPlugin.cc + YQGraphPluginImpl.cc + QY2Graph.cc ) + + +set( HEADERS + YQGraph.h + YQGraphPlugin.h + YQGraphPluginImpl.h + QY2Graph.h + ) + + + +# Add shared lib to be built +add_library( ${TARGETLIB} SHARED + ${SOURCES} + ${HEADERS} + ) + + +# +# Include directories and compile options +# + +set( LOCAL_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include ) + +# Create an include dir with some symlinks to include headers from sibling projects: +# build/src/include/yui/qt -> ../../libyui-qt/src +# build/src/include/yui/yui -> ../../libyui/src +add_custom_target( local-include-dir + COMMAND rm -rf ${LOCAL_INCLUDE_DIR} + COMMAND mkdir -p ${LOCAL_INCLUDE_DIR}/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src ${LOCAL_INCLUDE_DIR}/yui/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-qt/src ${LOCAL_INCLUDE_DIR}/yui/qt ) + +add_dependencies( ${TARGETLIB} local-include-dir ) + +# <yui/qt/YQFoo.h> from build/src/include/yui/qt -> ../../libyui-qt/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR} ) + +# <yui/YFoo.h> from build/src/include/yui/yui -> ../../libyui/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR}/yui ) + + +# Make the version from ../VERSION.cmake available as a #define +target_compile_definitions( ${TARGETLIB} PUBLIC VERSION="${VERSION}" ) + +# Add more compile options to this target in addition to those +# added in the toplevel CMakeLists.txt. +# +# Notice that CMake will automatically add -fPIC etc. where needed, +# like for this shared lib. +### target_compile_options( ${TARGETLIB} PUBLIC "-Dfoo" ) + +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +# Add more compile options to an individual source file: +### set_source_files_properties( YUI.cc PROPERTIES COMPILE_OPTIONS "-Dfoo" ) + + +# +# Linking +# + +# Find yui during a combined build +target_link_directories( ${TARGETLIB} BEFORE PUBLIC ../../libyui/build/src ) + + +# Libraries that are needed to build this shared lib +# +# If in doubt what is really needed, check with "ldd -u" which libs are unused. +target_link_libraries( ${TARGETLIB} + yui + ${LIBGVC_LIBRARIES} + Qt5::Core + Qt5::Gui + Qt5::Widgets + ) + + +# https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#target-p… +set_target_properties( ${TARGETLIB} PROPERTIES + VERSION ${SONAME} # From ../VERSION.cmake + SOVERSION ${SONAME_MAJOR} # From ../VERSION.cmake + OUTPUT_NAME ${TARGETLIB_BASE} + ) + + +# +# Install +# + +# Install the headers first so the message about the lib does not scroll away +install( FILES ${HEADERS} DESTINATION ${HEADERS_INSTALL_DIR} ) +install( TARGETS ${TARGETLIB} LIBRARY DESTINATION ${PLUGIN_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraph.cc new/libyui-qt-graph-4.0.1/src/YQGraph.cc --- old/libyui-qt-graph-2.46.6/src/YQGraph.cc 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraph.cc 2021-02-15 16:42:21.000000000 +0100 @@ -20,16 +20,16 @@ #define YUILogComponent "qt-graph" -#include "YUILog.h" +#include <yui/YUILog.h> -#include "YQGraph.h" +#include <yui/YEvent.h> +#include <yui/qt/YQUI.h> +#include <yui/qt/YQApplication.h> +#include <yui/qt/YQDialog.h> +#include <yui/qt/YQi18n.h> +#include <yui/qt/utf8.h> -#include "YQDialog.h" -#include "YQApplication.h" -#include "utf8.h" -#include "YQUI.h" -#include "YEvent.h" -#include "YQi18n.h" +#include "YQGraph.h" YQGraph::YQGraph(YWidget* parent, const string& filename, const string& layoutAlgorithm) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraph.h new/libyui-qt-graph-4.0.1/src/YQGraph.h --- old/libyui-qt-graph-2.46.6/src/YQGraph.h 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraph.h 2021-02-15 16:42:21.000000000 +0100 @@ -22,7 +22,7 @@ #ifndef YQGraph_h #define YQGraph_h -#include <YGraph.h> +#include <yui/YGraph.h> #include "QY2Graph.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.cc new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.cc --- old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.cc 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.cc 2021-02-15 16:42:21.000000000 +0100 @@ -19,11 +19,13 @@ */ -#include "YQGraphPlugin.h" #define YUILogComponent "qt-ui" -#include "YUILog.h" +#include <yui/YUILog.h> +#include <yui/YUIException.h> + +#include "YQGraphPlugin.h" #include "YQGraph.h" -#include "YUIException.h" + #define PLUGIN_BASE_NAME "qt_graph" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.h new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.h --- old/libyui-qt-graph-2.46.6/src/YQGraphPlugin.h 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraphPlugin.h 2021-02-15 16:42:21.000000000 +0100 @@ -22,7 +22,7 @@ #ifndef YQGraphPlugin_h #define YQGraphPlugin_h -#include <YGraphPlugin.h> +#include <yui/YGraphPlugin.h> #include "YQGraph.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.cc new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.cc --- old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.cc 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.cc 2021-02-15 16:42:21.000000000 +0100 @@ -23,7 +23,7 @@ #include "YQGraph.h" #define YUILogComponent "qt-graph" -#include <YUILog.h> +#include <yui/YUILog.h> /////////////////////////////////////////////////////////////////// // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.h new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.h --- old/libyui-qt-graph-2.46.6/src/YQGraphPluginImpl.h 2020-10-09 16:52:30.000000000 +0200 +++ new/libyui-qt-graph-4.0.1/src/YQGraphPluginImpl.h 2021-02-15 16:42:21.000000000 +0100 @@ -24,7 +24,8 @@ #include <graphviz/types.h> -#include "YQGraphPluginIf.h" +#include <yui/qt/YQGraphPluginIf.h> + class YQGraphPluginImpl : public YQGraphPluginIf {

1 0

commit libyui-qt-pkg for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libyui-qt-pkg for openSUSE:Factory checked in at 2021-02-26 21:58:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-pkg" Fri Feb 26 21:58:18 2021 rev:58 rq:872583 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg-doc.changes 2019-11-11 12:58:06.085544878 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378/libyui-qt-pkg-doc.changes 2021-02-26 21:58:21.115762881 +0100 @@ -1,0 +2,7 @@ +Mon Feb 1 14:59:18 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/libyui-qt-pkg/libyui-qt-pkg.changes 2020-12-01 14:21:35.761516038 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-pkg.new.2378/libyui-qt-pkg.changes 2021-02-26 21:58:21.507763226 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 15:25:39 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-qt (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:17 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Old: ---- libyui-qt-pkg-2.48.5.tar.bz2 New: ---- libyui-qt-pkg-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-pkg-doc.spec ++++++ --- /var/tmp/diff_new_pack.DbQwb3/_old 2021-02-26 21:58:22.103763749 +0100 +++ /var/tmp/diff_new_pack.DbQwb3/_new 2021-02-26 21:58:22.107763753 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-pkg-doc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,50 +17,58 @@ %define parent libyui-qt-pkg -%define so_version 14 +%define so_version 15 + Name: %{parent}-doc -Version: 2.48.5 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Summary: Libyui-qt-pkg documentation -License: LGPL-2.1-only OR LGPL-3.0-only -URL: https://github.com/libyui/ -Source: %{parent}-%{version}.tar.bz2 -BuildRequires: cmake >= 2.8 +BuildArch: noarch + +BuildRequires: cmake >= 3.10 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz -BuildRequires: graphviz-gnome BuildRequires: libyui-devel >= 3.9.0 -BuildRequires: texlive-epstopdf-bin -BuildRequires: texlive-latex -BuildArch: noarch + +Summary: Libyui-qt-pkg documentation +License: LGPL-2.1-only OR LGPL-3.0-only +URL: https://github.com/libyui/ +Source: %{parent}-%{version}.tar.bz2 %description -This package contains the Qt package selector -component for libYUI. +This package contains the Qt package selector component for libyui. + +This package provides HTML class documentation. -This package provides the documentation. (HTML & PDF) %prep %setup -q -n %{parent}-%{version} %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" -./bootstrap.sh %{_prefix} +mkdir build +cd build + +cmake .. \ + -DBUILD_DOC=on \ + -DBUILD_SRC=off \ + -DDOC_DESTDIR=$RPM_BUILD_ROOT -%cmake \ - -DDOC_DIR=%{_docdir} \ - -DDOCS_ONLY=ON -%cmake_build docs +# No "make doc" here: This would only duplicate the doxygen call %install -%cmake_install + +cd build +make install-doc +# This implicitly includes "make doc" unconditionally + %fdupes -s %{buildroot}/%{_docdir}/%{parent}%{so_version} %files +%defattr(-,root,root) %doc %{_docdir}/%{parent}%{so_version} %changelog ++++++ libyui-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.DbQwb3/_old 2021-02-26 21:58:22.123763767 +0100 +++ /var/tmp/diff_new_pack.DbQwb3/_new 2021-02-26 21:58:22.127763770 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-pkg # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,44 +16,53 @@ # -%define so_version 14 -%define bin_name %{name}%{so_version} -%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1 -%define libzypp_devel_version libzypp-devel >= 17.21.0 Name: libyui-qt-pkg -Version: 2.48.5 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 + +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.10.0 +%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1 +%define libzypp_devel_version libzypp-devel >= 17.21.0 +%define bin_name %{name}%{so_version} + +BuildRequires: boost-devel +BuildRequires: cmake >= 3.10 +BuildRequires: gcc-c++ +BuildRequires: pkg-config + +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) + +BuildRequires: %{libyui_devel_version} +BuildRequires: %{libyui_qt_devel_version} +BuildRequires: %{libzypp_devel_version} + Summary: Libyui - Qt Package Selector License: LGPL-2.1-only OR LGPL-3.0-only URL: https://github.com/libyui/ Source: %{name}-%{version}.tar.bz2 -BuildRequires: %{libyui_qt_devel_version} -BuildRequires: %{libzypp_devel_version} -BuildRequires: cmake >= 2.8 -BuildRequires: gcc-c++ -BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtsvg-devel -BuildRequires: libqt5-qtx11extras-devel -BuildRequires: libyui-devel >= 3.9.0 -BuildRequires: pkgconfig -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif %description -This package contains the Qt package selector -component for libYUI. +This package contains the Qt package selector component for libyui. + %package -n %{bin_name} -Summary: Libyui - Qt Package Selector +Summary: Libyui - Qt package selector + # bsc#1114654: Need Qt SVG support for icons (built-in and from theme) Requires: libQt5Svg5 # Selectable::hasRetracted() Requires: libzypp >= 17.21.0 # YPackageSelector#onlineSearchEnabled() Requires: libyui%{so_version} >= 3.9.2 +Requires: libyui-qt%{so_version} Supplements: (libyui-qt and yast2-packager) Conflicts: libqdialogsolver1 < 1.4.0 Provides: %{name} = %{version} @@ -67,52 +76,67 @@ Obsoletes: libqdialogsolver1 < 1.4.0 %description -n %{bin_name} -This package contains the Qt package selector -component for libYUI. +This package contains the Qt package selector component for libyui. + %package devel Summary: Libyui-qt-pkg header files + Requires: %{bin_name} = %{version} Requires: %{libyui_qt_devel_version} Requires: %{libzypp_devel_version} %description devel -This package contains the Qt package selector -component for libYUI. +This package contains the Qt package selector component for libyui. This can be used independently of YaST for generic (C++) applications. This package has very few dependencies. + %prep %setup -q %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" -./bootstrap.sh %{_prefix} +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + +mkdir build +cd build -%cmake \ - -DYPREFIX=%{_prefix} \ +%if %{?_with_debug:1}%{!?_with_debug:0} +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" +%else +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" +%endif + +cmake .. \ -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} -%cmake_build + -DLIB_DIR=%{_lib} \ + $CMAKE_OPTS + +make %{?jobs:-j%jobs} %install -%cmake_install +cd build +make install DESTDIR="$RPM_BUILD_ROOT" +install -m0755 -d $RPM_BUILD_ROOT/%{_libdir}/yui +install -m0755 -d $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ +install -m0644 ../COPYING* $RPM_BUILD_ROOT/%{_docdir}/%{bin_name}/ %post -n %{bin_name} -p /sbin/ldconfig %postun -n %{bin_name} -p /sbin/ldconfig %files -n %{bin_name} -%license COPYING* +%defattr(-,root,root) %dir %{_libdir}/yui %{_libdir}/yui/lib*.so.* +%doc %dir %{_docdir}/%{bin_name} +%license %{_docdir}/%{bin_name}/COPYING* %files devel +%defattr(-,root,root) %{_libdir}/yui/lib*.so -%{_includedir}/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/qt-pkg %changelog ++++++ libyui-qt-pkg-2.48.5.tar.bz2 -> libyui-qt-pkg-4.0.1.tar.bz2 ++++++ ++++ 4005 lines of diff (skipped)

1 0

commit libyui-ncurses-rest-api for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libyui-ncurses-rest-api for openSUSE:Factory checked in at 2021-02-26 21:58:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-rest-api (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses-rest-api.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-ncurses-rest-api" Fri Feb 26 21:58:19 2021 rev:8 rq:872584 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses-rest-api/libyui-ncurses-rest-api.changes 2020-12-01 14:21:33.917514043 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses-rest-api.new.2378/libyui-ncurses-rest-api.changes 2021-02-26 21:58:22.499764097 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 15:26:50 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-ncurses (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:10 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-rest-api-0.2.3.tar.bz2 New: ---- libyui-ncurses-rest-api-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-rest-api.spec ++++++ --- /var/tmp/diff_new_pack.8uLWWg/_old 2021-02-26 21:58:22.875764428 +0100 +++ /var/tmp/diff_new_pack.8uLWWg/_new 2021-02-26 21:58:22.879764431 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-ncurses-rest-api # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,45 +16,40 @@ # -%define so_version 14 -%define bin_name %{name}%{so_version} -%define libyui_devel_version libyui-devel >= 3.8.0 - Name: libyui-ncurses-rest-api -Version: 0.2.3 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Summary: Libyui - The REST API plugin for the Ncurses frontend -License: LGPL-2.1-only OR LGPL-3.0-only -Group: System/Libraries -URL: http://github.com/libyui/libyui-ncurses-rest-api -Source: %{name}-%{version}.tar.bz2 + +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.8.0 +%define bin_name %{name}%{so_version} BuildRequires: %{libyui_devel_version} -BuildRequires: cmake >= 2.8 +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ -BuildRequires: libyui-rest-api-devel -# ncurses UI specific BuildRequires: libyui-ncurses-devel >= 2.51.0 -BuildRequires: ncurses-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: libyui-rest-api-devel + +Summary: Libyui - REST API plugin for the Ncurses frontend +License: LGPL-2.1-only OR LGPL-3.0-only +URL: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 %description This package provides a libyui REST API plugin for the Ncurses frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package -n %{bin_name} -Summary: Libyui - The REST API plugin for the Ncurses frontend -Group: System/Libraries -URL: http://github.com/libyui/libyui-ncurses-rest-api +Summary: Libyui - REST API plugin for the Ncurses frontend + Requires: libyui%{so_version} +Requires: libyui-ncurses%{so_version} Requires: libyui-rest-api%{so_version} Requires: yui_backend = %{so_version} Provides: %{name} = %{version} @@ -65,56 +60,58 @@ Ncurses frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package devel -Summary: Libyui header files -Group: Development/Languages/C and C++ -URL: http://github.com/libyui/libyui-ncurses-rest-api +Summary: Libyui - Header files for the NCurses REST API plugin + Requires: %{bin_name} = %{version} Requires: glibc-devel Requires: libstdc++-devel +Requires: libyui-ncurses-devel Requires: libyui-rest-api-devel -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -Requires: libboost_test-devel -%else -Requires: boost-devel -%endif %description devel -This package provides a libyui REST API plugin for the Ncurses frontend. -This is a development subpackage. +This provides a libyui REST API plugin for the Ncurses frontend. +This package contains the header files for the plugin. + +This is not needed for using the REST API, only for developing +extensions for it. + %prep %setup -q %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} +mkdir build +cd build -# NOTE: %%cmake changes the CWD to "build" which is later expected by -# %%cmake_build, be careful when running additional commands later... -%cmake -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ %if %{?_with_debug:1}%{!?_with_debug:0} - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else - -DCMAKE_BUILD_TYPE=RELEASE +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" %endif -%cmake_build +cmake .. \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + $CMAKE_OPTS + +make %{?jobs:-j%jobs} %install -%cmake_install -install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ + +cd build +make install DESTDIR="$RPM_BUILD_ROOT" install -m0755 -d %{buildroot}/%{_libdir}/yui -install -m0644 COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0644 ../COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ %post -n %{bin_name} -p /sbin/ldconfig %postun -n %{bin_name} -p /sbin/ldconfig @@ -126,10 +123,7 @@ %license %{_docdir}/%{bin_name}/COPYING* %files devel -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_includedir}/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/ncurses-rest-api %changelog ++++++ libyui-ncurses-rest-api-0.2.3.tar.bz2 -> libyui-ncurses-rest-api-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/CMakeLists.txt new/libyui-ncurses-rest-api-4.0.1/CMakeLists.txt --- old/libyui-ncurses-rest-api-0.2.3/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/CMakeLists.txt 2021-02-15 16:41:52.000000000 +0100 @@ -0,0 +1,60 @@ +# CMakeLists.txt for libyui-ncurse-rest-api +# +# Usage: +# +# mkdir build +# cd build +# cmake .. +# +# make +# sudo make install +# +# Restart with a clean build environment: +# rm -rf build +# +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +cmake_minimum_required( VERSION 3.10 ) +project( libyui-ncurses-rest-api ) + +# Options usage: +# +# cmake -DBUILD_DOC=on -DBUILD_EXAMPLES=off .. + +option( BUILD_SRC "Build in src/ subdirectory" on ) +option( BUILD_DOC "Build class documentation" off ) +option( WERROR "Treat all compiler warnings as errors" on ) + +# Non-boolean options +set( DOC_DESTDIR "" CACHE STRING "Destination directory prefix for installing docs" ) + +#---------------------------------------------------------------------- + + +# As of now, no support for /usr/local instead of /usr. But CMake DESTDIR works. +set( CMAKE_INSTALL_PREFIX /usr ) + +set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make install" + + +# Initialize compiler flags for all targets in all subdirectories +add_compile_options( "-Wall" ) +add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds) + +if ( WERROR ) + add_compile_options( "-Werror" ) +endif() + + +# +# Descend into subdirectories +# + +if ( BUILD_SRC ) + add_subdirectory( src ) +endif() + +if ( BUILD_DOC ) + add_subdirectory( doc ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/Makefile.cvs new/libyui-ncurses-rest-api-4.0.1/Makefile.cvs --- old/libyui-ncurses-rest-api-0.2.3/Makefile.cvs 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# Makefile.cvs -# - -all: configure - -configure: clean - ./bootstrap.sh ; \ - mkdir build ; \ - cd build ; \ - cmake -DCMAKE_BUILD_TYPE=RELEASE .. - -install: configure - cd build ; \ - make && make install - -reconf: - cd build ; \ - cmake rebuild_cache - -clean: - rm -rf build \ - CMakeLists.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/Makefile.repo new/libyui-ncurses-rest-api-4.0.1/Makefile.repo --- old/libyui-ncurses-rest-api-0.2.3/Makefile.repo 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/Makefile.repo 2021-02-15 16:41:52.000000000 +0100 @@ -0,0 +1,63 @@ +# +# Makefile.repo for libyui-qt-rest-api +# + +# Local Variables: +# mode: Makefile +# End: + + +all: clean configure build-hint + +build-hint: + @echo "" + @echo "To build:" + @echo "" + @echo " cd build" + @echo " make" + @echo "" + +configure: + mkdir build; \ + cd build; \ + cmake .. + +build: clean configure + cd build; \ + make -j $$(nproc) + +# This needs root privileges, of course +install: configure + cd build; \ + make -j $$(nproc) && make install + +clean: + rm -rf build + +package: + rake package + +doc: + test -d build || mkdir build + cd build; \ + cmake -DBUILD_DOC=on .. ; \ + make doc + +install-doc: doc + cd build; \ + make install-doc + +version-bump: + rake version:bump + +# Just an alias +bump-version: version-bump + + +# Enforce rebuilding some targets unconditionally, even if a file or directory +# with that name exists; otherwise the timestamp of that file or directory +# would be checked. +# +# We need this because we have a subdirectory doc/, a subdirectory package/ +# and possibly a subdirectory build/ here. +.PHONY: doc package build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/PROJECTINFO.cmake new/libyui-ncurses-rest-api-4.0.1/PROJECTINFO.cmake --- old/libyui-ncurses-rest-api-0.2.3/PROJECTINFO.cmake 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/PROJECTINFO.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -##### PROJECTINFO for CMake - -SET( BASELIB "yui" ) # don't change this - -##### MAKE ALL NEEDED CHANGES HERE ##### - -SET( PLUGINNAME ncurses-rest-api ) -SET( SUBDIRS src ) -SET( LIB_DEPS Boost ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line -SET( LIB_LINKER dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! -SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here. -SET( INTERNAL_DEPS Libyui Libyui-ncurses Libyui-rest-api ) -SET( URL "http://github.com/libyui/" ) -SET( SUMMARY "GUI-abstraction library - the REST API bindings for the ncurses UI plugin" ) -SET( DESCRIPTION "This is the REST API plugin for the ncurses UI." ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/Rakefile new/libyui-ncurses-rest-api-4.0.1/Rakefile --- old/libyui-ncurses-rest-api-0.2.3/Rakefile 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/Rakefile 2021-02-15 16:41:52.000000000 +0100 @@ -1,6 +1,16 @@ -# -*- coding: utf-8 -*- -# make continuous integration using rubygem-packaging_rake_tasks and -# rubygem-libyui-rake. -# Copyright �� 2014 SUSE LLC - +#-- +# Copyright (c) 2015-2019 SUSE LLC +# Copyright (c) 2020-2021 SUSE LLC +# +# make continuous integration using rubygem-libyui-rake. +# +# MIT license +#++ require "libyui/rake" + +Libyui::Tasks.configuration do |conf| + include Libyui::Tasks::Helpers + + conf.skip_license_check << /^Makefile\.repo$/ + conf.skip_license_check << /CMakeLists\.txt$/ +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/SOURCECONF.cmake new/libyui-ncurses-rest-api-4.0.1/SOURCECONF.cmake --- old/libyui-ncurses-rest-api-0.2.3/SOURCECONF.cmake 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/SOURCECONF.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -SET( ${TARGETLIB}_SOURCES - YNCHttpUI.cc - YNCHttpWidgetsActionHandler.cc - YNCWidgetActionHandler.cc - NCHttpWidgetFactory.cc - NCHttpDialog.cc -) - -SET( ${TARGETLIB}_HEADERS - YNCHttpUI.h - YNCHttpWidgetsActionHandler.h - YNCWidgetActionHandler.h - NCHttpDialog.h - NCHttpWidgetFactory.h -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/VERSION.cmake new/libyui-ncurses-rest-api-4.0.1/VERSION.cmake --- old/libyui-ncurses-rest-api-0.2.3/VERSION.cmake 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/VERSION.cmake 2021-02-15 16:41:52.000000000 +0100 @@ -1,14 +1,9 @@ -SET( VERSION_MAJOR "0") -SET( VERSION_MINOR "2" ) -SET( VERSION_PATCH "3" ) -SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) +SET( VERSION_MAJOR "4") +SET( VERSION_MINOR "0" ) +SET( VERSION_PATCH "1" ) +SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -##### This is need for the libyui core ONLY. -##### These will be overridden from exports in LibyuiConfig.cmake -# Currently you must also change so_version in libyui.spec -# *and also in **all** other* libyui-*.spec files in the other repositories. -# Yes, such a design is suboptimal. -SET( SONAME_MAJOR "0" ) +SET( SONAME_MAJOR "15" ) SET( SONAME_MINOR "0" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/bootstrap.sh new/libyui-ncurses-rest-api-4.0.1/bootstrap.sh --- old/libyui-ncurses-rest-api-0.2.3/bootstrap.sh 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/bin/sh -set -e - -prefix="/usr" - -if [ ! -z $1 ] -then - prefix="$1" -fi - -cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common" -cmake_target="./CMakeLists.txt" - -echo "checking for $cmake_common..." - -if [ -f "$cmake_common" ] -then - ln -fs "$cmake_common" "$cmake_target" - echo "OK: linked to `pwd`/$cmake_target." -else - echo " Use must have libyui(-devel) >= 3.0.4 installed" - echo " in \"$prefix\" first !!!" - exit 1 -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/doc/CMakeLists.txt new/libyui-ncurses-rest-api-4.0.1/doc/CMakeLists.txt --- old/libyui-ncurses-rest-api-0.2.3/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/doc/CMakeLists.txt 2021-02-15 16:41:52.000000000 +0100 @@ -0,0 +1,42 @@ +# CMakeLists.txt for libyui-qt-rest-api/doc + +include( ../VERSION.cmake ) + +find_package( Doxygen REQUIRED dot ) + + +set( PKG_NAME libyui-qt-rest-api${SONAME_MAJOR} ) +set( DOC_INSTALL_DIR ${DOC_DESTDIR}/usr/share/doc/packages/${PKG_NAME} ) + + +# +# Doxygen-generated autodocs +# + +if ( DOXYGEN_FOUND ) + + set( DOXYGEN_GENERATE_TREEVIEW yes ) # Enable views tree HTML frame + set( DOXYGEN_QUIET yes ) # Less verbose output + set( DOXYGEN_WARN_LOGFILE doxygen-warnings.log ) + # See build/CMakeDoxyfile.in for more supported variables + + doxygen_add_docs( doc ../src ) + +else() + message( WARNING "Missing doxygen package" ) +endif() + + +# Define a new custom make target "install-doc". +# Notice that we can't use DESTDIR here since CMake only sets that +# for "make install", not for this custom "make install-doc". +# https://gist.github.com/shundhammer/12b6343309544a5920f51cd0063eeecf + +add_custom_target( install-doc + DEPENDS doc + + COMMAND mkdir -m 755 -p ${DOC_INSTALL_DIR}/html + COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/html ${DOC_INSTALL_DIR} + + COMMENT "Installing documentation to ${DOC_INSTALL_DIR}" ) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/package/libyui-ncurses-rest-api.changes new/libyui-ncurses-rest-api-4.0.1/package/libyui-ncurses-rest-api.changes --- old/libyui-ncurses-rest-api-0.2.3/package/libyui-ncurses-rest-api.changes 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/package/libyui-ncurses-rest-api.changes 2021-02-15 16:41:52.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Mon Feb 15 15:26:50 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-ncurses (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:10 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Fri Nov 27 10:41:59 UTC 2020 - Rodion Iafarov <riafarov(a)suse.com> - Create structure to move handlers to separate classes (bsc#1132247) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/package/libyui-ncurses-rest-api.spec new/libyui-ncurses-rest-api-4.0.1/package/libyui-ncurses-rest-api.spec --- old/libyui-ncurses-rest-api-0.2.3/package/libyui-ncurses-rest-api.spec 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/package/libyui-ncurses-rest-api.spec 2021-02-15 16:41:52.000000000 +0100 @@ -2,6 +2,7 @@ # spec file for package libyui-ncurses-rest-api # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,120 +17,120 @@ # -%define so_version 14 -%define bin_name %{name}%{so_version} -%define libyui_devel_version libyui-devel >= 3.8.0 - Name: libyui-ncurses-rest-api -Version: 0.2.3 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Summary: Libyui - The REST API plugin for the Ncurses frontend -License: LGPL-2.1-only OR LGPL-3.0-only -Group: System/Libraries -URL: http://github.com/libyui/libyui-ncurses-rest-api -Source: %{name}-%{version}.tar.bz2 -BuildRequires: %{libyui_devel_version} -BuildRequires: libyui-rest-api-devel -BuildRequires: cmake >= 2.8 +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.8.0 +%define bin_name %{name}%{so_version} + +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ -# ncurses UI specific +BuildRequires: %{libyui_devel_version} BuildRequires: libyui-ncurses-devel >= 2.51.0 -BuildRequires: ncurses-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: libyui-rest-api-devel + +Summary: Libyui - REST API plugin for the Ncurses frontend +License: LGPL-2.1-only OR LGPL-3.0-only +URL: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 + %description This package provides a libyui REST API plugin for the Ncurses frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package -n %{bin_name} -Summary: Libyui - The REST API plugin for the Ncurses frontend -Group: System/Libraries -URL: http://github.com/libyui/libyui-ncurses-rest-api +Summary: Libyui - REST API plugin for the Ncurses frontend + Requires: libyui%{so_version} -Requires: yui_backend = %{so_version} +Requires: libyui-ncurses%{so_version} Requires: libyui-rest-api%{so_version} +Requires: yui_backend = %{so_version} Provides: %{name} = %{version} Supplements: (libyui-rest-api and libyui-ncurses) + %description -n %{bin_name} This package provides a libyui REST API plugin for the Ncurses frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package devel -Summary: Libyui header files -Group: Development/Languages/C and C++ -URL: http://github.com/libyui/libyui-ncurses-rest-api +Summary: Libyui - Header files for the NCurses REST API plugin + Requires: %{bin_name} = %{version} Requires: glibc-devel Requires: libstdc++-devel +Requires: libyui-ncurses-devel Requires: libyui-rest-api-devel -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -Requires: libboost_test-devel -%else -Requires: boost-devel -%endif %description devel -This package provides a libyui REST API plugin for the Ncurses frontend. -This is a development subpackage. +This provides a libyui REST API plugin for the Ncurses frontend. +This package contains the header files for the plugin. + +This is not needed for using the REST API, only for developing +extensions for it. + %prep %setup -q %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} +mkdir build +cd build -# NOTE: %%cmake changes the CWD to "build" which is later expected by -# %%cmake_build, be careful when running additional commands later... -%cmake -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ %if %{?_with_debug:1}%{!?_with_debug:0} - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else - -DCMAKE_BUILD_TYPE=RELEASE +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" %endif -%cmake_build +cmake .. \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + $CMAKE_OPTS + +make %{?jobs:-j%jobs} + %install -%cmake_install -install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ + +cd build +make install DESTDIR="$RPM_BUILD_ROOT" install -m0755 -d %{buildroot}/%{_libdir}/yui -install -m0644 COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0644 ../COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ + %post -n %{bin_name} -p /sbin/ldconfig %postun -n %{bin_name} -p /sbin/ldconfig + %files -n %{bin_name} %dir %{_libdir}/yui %{_libdir}/yui/lib*.so.* %doc %dir %{_docdir}/%{bin_name} %license %{_docdir}/%{bin_name}/COPYING* + %files devel -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_includedir}/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/ncurses-rest-api %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/CMakeLists.txt new/libyui-ncurses-rest-api-4.0.1/src/CMakeLists.txt --- old/libyui-ncurses-rest-api-0.2.3/src/CMakeLists.txt 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/CMakeLists.txt 2021-02-15 16:41:52.000000000 +0100 @@ -1,7 +1,135 @@ -# Find includes in corresponding build directories -set( CMAKE_INCLUDE_CURRENT_DIR ON ) +# CMakeLists.txt for libyui-ncurses-rest-api/src -PROCESS_SOURCES() -target_link_libraries( - ${TARGETLIB} +include( ../VERSION.cmake ) +include( GNUInstallDirs ) # set CMAKE_INSTALL_INCLUDEDIR, ..._LIBDIR + + +# +# libyui-rest-api plugin specific +# + +set( TARGETLIB libyui-ncurses-rest-api ) +set( TARGETLIB_BASE yui-ncurses-rest-api ) + +set( HEADERS_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/yui/ncurses-rest-api ) +set( PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/yui ) # /usr/lib64/yui + +# if DESTDIR is set, CMAKE_INSTALL_INCLUDEDIR already contains it +# during "make install" (but not for other make targets!): +# +# sudo make install DESTDIR=/work/foo +# or +# DESTDIR=/work/foo sudo make install +# +# -> the include files are installed to /work/foo/usr/include/... +# We need that for RPM builds to install everything to $RPM_BUILD_ROOT. + + +set( SOURCES + YNCHttpUI.cc + YNCHttpWidgetsActionHandler.cc + YNCWidgetActionHandler.cc + NCHttpWidgetFactory.cc + NCHttpDialog.cc + ) + + +set( HEADERS + YNCHttpUI.h + YNCHttpWidgetsActionHandler.h + YNCWidgetActionHandler.h + NCHttpWidgetFactory.h + NCHttpDialog.h ) + + +# Add shared lib to be built +add_library( ${TARGETLIB} SHARED + ${SOURCES} + ${HEADERS} + ) + + +# +# Include directories and compile options +# + + +set( LOCAL_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include ) + +# Create an include dir with some symlinks to include headers from sibling projects: +# build/src/include/yui/ncurses -> ../../libyui-ncurses/src +# build/src/include/yui/rest-api -> ../../libyui-rest-api/src +# build/src/include/yui/yui -> ../../libyui/src +add_custom_target( local-include-dir + COMMAND rm -rf ${LOCAL_INCLUDE_DIR} + COMMAND mkdir -p ${LOCAL_INCLUDE_DIR}/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src ${LOCAL_INCLUDE_DIR}/yui/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-ncurses/src ${LOCAL_INCLUDE_DIR}/yui/ncurses + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-rest-api/src ${LOCAL_INCLUDE_DIR}/yui/rest-api ) + +add_dependencies( ${TARGETLIB} local-include-dir ) + +# <yui/ncurses/NCFoo.h> from build/src/include/yui/ncurses -> ../../libyui-ncurses/src +# <yui/rest-api/YRestFoo.h> from build/src/include/yui/rest-api -> ../../libyui-rest-api/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR} ) + +# <yui/YFoo.h> from build/src/include/yui/yui -> ../../libyui/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR}/yui ) + + +# FIXME start +# Also add those directories directly until the full transition is done: +# The headers of older libyui-rest-api packages still #include "YSomeWidget.h" +target_include_directories( ${TARGETLIB} BEFORE PUBLIC /usr/include/yui ) +# Remove this when those old packages are history. +# FIXME end + +# Make the version from ../VERSION.cmake available as a #define +target_compile_definitions( ${TARGETLIB} PUBLIC VERSION="${VERSION}" ) + +# Add more compile options to this target in addition to those +# added in the toplevel CMakeLists.txt. +# +# Notice that CMake will automatically add -fPIC etc. where needed, +# like for this shared lib. +### target_compile_options( ${TARGETLIB} PUBLIC "-Dfoo" ) + +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +# Add more compile options to an individual source file: +### set_source_files_properties( YUI.cc PROPERTIES COMPILE_OPTIONS "-Dfoo" ) + + +# +# Linking +# + +# Find yui during a combined build +target_link_directories( ${TARGETLIB} BEFORE PUBLIC ../../libyui/build/src ) + + +# Libraries that are needed to build this shared lib +# +# If in doubt what is really needed, check with "ldd -u" which libs are unused. +target_link_libraries( ${TARGETLIB} + yui + ) + + +# https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#target-p… +set_target_properties( ${TARGETLIB} PROPERTIES + VERSION ${SONAME} # From ../VERSION.cmake + SOVERSION ${SONAME_MAJOR} # From ../VERSION.cmake + OUTPUT_NAME ${TARGETLIB_BASE} + ) + + +# +# Install +# + +# Install the headers first so the message about the lib does not scroll away +install( FILES ${HEADERS} DESTINATION ${HEADERS_INSTALL_DIR} ) +install( TARGETS ${TARGETLIB} LIBRARY DESTINATION ${PLUGIN_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/NCHttpDialog.cc new/libyui-ncurses-rest-api-4.0.1/src/NCHttpDialog.cc --- old/libyui-ncurses-rest-api-0.2.3/src/NCHttpDialog.cc 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/NCHttpDialog.cc 2021-02-15 16:41:52.000000000 +0100 @@ -13,12 +13,15 @@ Floor, Boston, MA 02110-1301 USA */ +#include <chrono> + #define YUILogComponent "ncurses-rest-api" #include <yui/YUILog.h> + +#include <yui/rest-api/YHttpServer.h> + #include "NCHttpDialog.h" -#include "YHttpServer.h" -#include <chrono> NCHttpDialog::NCHttpDialog( YDialogType dialogType, YDialogColorMode colorMode ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/NCHttpDialog.h new/libyui-ncurses-rest-api-4.0.1/src/NCHttpDialog.h --- old/libyui-ncurses-rest-api-0.2.3/src/NCHttpDialog.h 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/NCHttpDialog.h 2021-02-15 16:41:52.000000000 +0100 @@ -23,7 +23,8 @@ #ifndef NCHttpDialog_h #define NCHttpDialog_h -#include "NCDialog.h" +#include <yui/ncurses/NCDialog.h> + class NCHttpDialog: public NCDialog { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/NCHttpWidgetFactory.cc new/libyui-ncurses-rest-api-4.0.1/src/NCHttpWidgetFactory.cc --- old/libyui-ncurses-rest-api-0.2.3/src/NCHttpWidgetFactory.cc 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/NCHttpWidgetFactory.cc 2021-02-15 16:41:52.000000000 +0100 @@ -13,15 +13,12 @@ Floor, Boston, MA 02110-1301 USA */ -#include "NCHttpDialog.h" -#include "NCHttpWidgetFactory.h" - #define YUILogComponent "ncurses-rest-api" #include <yui/YUILog.h> -// -// Dialogs -// +#include "NCHttpDialog.h" +#include "NCHttpWidgetFactory.h" + NCDialog * NCHttpWidgetFactory::createDialog( YDialogType dialogType, YDialogColorMode colorMode ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/NCHttpWidgetFactory.h new/libyui-ncurses-rest-api-4.0.1/src/NCHttpWidgetFactory.h --- old/libyui-ncurses-rest-api-0.2.3/src/NCHttpWidgetFactory.h 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/NCHttpWidgetFactory.h 2021-02-15 16:41:52.000000000 +0100 @@ -24,7 +24,8 @@ #ifndef NCHttpWidgetFactory_h #define NCHttpWidgetFactory_h -#include "NCWidgetFactory.h" +#include <yui/ncurses/NCWidgetFactory.h> + /** * Concrete widget factory for mandatory widgets. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpUI.cc new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpUI.cc --- old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpUI.cc 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpUI.cc 2021-02-15 16:41:52.000000000 +0100 @@ -14,19 +14,19 @@ */ /*-/ - File: YNCursesUI.cc Author: Author: Rodion Iafarov <riafarov(a)suse.com> /-*/ -#include "YNCHttpUI.h" +#define YUILogComponent "ncurses-rest-api" +#include <yui/YUILog.h> +#include <yui/rest-api/YHttpServer.h> + +#include "YNCHttpUI.h" +#include "YNCHttpWidgetsActionHandler.h" #include "NCHttpWidgetFactory.h" #include "NCHttpDialog.h" -#include "YHttpServer.h" -#include "YNCHttpWidgetsActionHandler.h" -#define YUILogComponent "ncurses-rest-api" -#include <yui/YUILog.h> YNCHttpUI::YNCHttpUI( bool withThreads ) : YNCursesUI( withThreads, false ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpUI.h new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpUI.h --- old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpUI.h 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpUI.h 2021-02-15 16:41:52.000000000 +0100 @@ -23,11 +23,12 @@ #ifndef YNCHttpUI_h #define YNCHttpUI_h -#include "YNCursesUI.h" -#include "NCApplication.h" -#include "NCurses.h" -#include "NCHttpWidgetFactory.h" #include <yui/YUI.h> +#include <yui/ncurses/YNCursesUI.h> +#include <yui/ncurses/NCApplication.h> +#include <yui/ncurses/NCurses.h> +#include "NCHttpWidgetFactory.h" + class YNCHttpUI: public YNCursesUI { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpWidgetsActionHandler.cc new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpWidgetsActionHandler.cc --- old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpWidgetsActionHandler.cc 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpWidgetsActionHandler.cc 2021-02-15 16:41:52.000000000 +0100 @@ -14,16 +14,13 @@ Floor, Boston, MA 02110-1301 USA */ -#ifndef YUILogComponent #define YUILogComponent "ncurses-rest-api" -#endif //YUILogComponent - -#include "YUILog.h" +#include <yui/YUILog.h> #include "YNCHttpWidgetsActionHandler.h" - #include "YNCWidgetActionHandler.h" + YWidgetActionHandler* YNCHttpWidgetsActionHandler::get_widget_handler() { if( !widget_action_handler ){ widget_action_handler = new YNCWidgetActionHandler(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpWidgetsActionHandler.h new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpWidgetsActionHandler.h --- old/libyui-ncurses-rest-api-0.2.3/src/YNCHttpWidgetsActionHandler.h 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/YNCHttpWidgetsActionHandler.h 2021-02-15 16:41:52.000000000 +0100 @@ -17,7 +17,8 @@ #ifndef YNCHttpWidgetsActionHandler_h #define YNCHttpWidgetsActionHandler_h -#include "YHttpWidgetsActionHandler.h" +#include <yui/rest-api/YHttpWidgetsActionHandler.h> + class YNCHttpWidgetsActionHandler : public YHttpWidgetsActionHandler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-rest-api-0.2.3/src/YNCWidgetActionHandler.h new/libyui-ncurses-rest-api-4.0.1/src/YNCWidgetActionHandler.h --- old/libyui-ncurses-rest-api-0.2.3/src/YNCWidgetActionHandler.h 2020-11-30 09:55:44.000000000 +0100 +++ new/libyui-ncurses-rest-api-4.0.1/src/YNCWidgetActionHandler.h 2021-02-15 16:41:52.000000000 +0100 @@ -17,16 +17,11 @@ #ifndef YNCWidgetActionHandler_h #define YNCWidgetActionHandler_h -#include <iostream> -#include <functional> -#include <microhttpd.h> -#include <sstream> #include <yui/YEvent.h> +#include <yui/rest-api/YWidgetActionHandler.h> #include "YNCHttpUI.h" -#include "YWidgetActionHandler.h" -#include <boost/algorithm/string.hpp> class YNCWidgetActionHandler : public YWidgetActionHandler {

1 0

commit libyui-qt-rest-api for openSUSE:Factory
by Source-Sync 26 Feb '21

26 Feb '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libyui-qt-rest-api for openSUSE:Factory checked in at 2021-02-26 21:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-qt-rest-api (Old) and /work/SRC/openSUSE:Factory/.libyui-qt-rest-api.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-qt-rest-api" Fri Feb 26 21:58:16 2021 rev:9 rq:872582 version:4.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-qt-rest-api/libyui-qt-rest-api.changes 2020-12-01 14:21:34.577514757 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-qt-rest-api.new.2378/libyui-qt-rest-api.changes 2021-02-26 21:58:19.223761220 +0100 @@ -1,0 +2,13 @@ +Mon Feb 15 15:25:55 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-qt (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:19 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Old: ---- libyui-qt-rest-api-0.2.4.tar.bz2 New: ---- libyui-qt-rest-api-4.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-qt-rest-api.spec ++++++ --- /var/tmp/diff_new_pack.PfI5rj/_old 2021-02-26 21:58:19.723761659 +0100 +++ /var/tmp/diff_new_pack.PfI5rj/_new 2021-02-26 21:58:19.727761663 +0100 @@ -1,7 +1,7 @@ # # spec file for package libyui-qt-rest-api # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,49 +16,47 @@ # -%define so_version 14 -%define bin_name %{name}%{so_version} -%define libyui_devel_version libyui-devel >= 3.10.1 - Name: libyui-qt-rest-api -Version: 0.2.4 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Summary: Libyui - The REST API plugin for the Qt frontend -License: LGPL-2.1-only OR LGPL-3.0-only -Group: System/Libraries -URL: http://github.com/libyui/libyui-qt-rest-api -Source: %{name}-%{version}.tar.bz2 + +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.10.1 +%define bin_name %{name}%{so_version} BuildRequires: %{libyui_devel_version} -BuildRequires: cmake >= 2.8 -BuildRequires: fontconfig-devel +BuildRequires: boost-devel +BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ BuildRequires: libyui-qt-devel BuildRequires: libyui-rest-api-devel + BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif + +Summary: Libyui - The REST API plugin for the Qt frontend +License: LGPL-2.1-only OR LGPL-3.0-only +URL: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 %description -This package provides a libyui REST API plugin. +This package provides a libyui REST API plugin for the Qt frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package -n %{bin_name} Summary: Libyui - The REST API plugin for the Qt frontend -Group: System/Libraries -URL: http://github.com/libyui/libyui-qt-rest-api + Requires: libyui%{so_version} +Requires: libyui-qt%{so_version} Requires: libyui-rest-api%{so_version} Requires: yui_backend = %{so_version} Provides: %{name} = %{version} @@ -68,58 +66,58 @@ This package provides a libyui REST API plugin for the Qt frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package devel -Summary: Libyui header files -Group: Development/Languages/C and C++ -URL: http://github.com/libyui/libyui-qt-rest-api -BuildRequires: libyui-rest-api-devel +Summary: Libyui - Header files for the Qt REST API plugin + Requires: %{bin_name} = %{version} Requires: glibc-devel Requires: libstdc++-devel Requires: libyui-qt-devel Requires: libyui-rest-api-devel -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -Requires: libboost_test-devel -%else -Requires: boost-devel -%endif %description devel -This package provides a libyui REST API plugin for the Qt frontend. +This provides a libyui REST API plugin for the Qt frontend. + +This package contains the header files for the plugin. + +This is not needed for using the REST API, only for developing +extensions for it. -This is a development subpackage. %prep %setup -q %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} +mkdir build +cd build -# NOTE: %%cmake changes the CWD to "build" which is later expected by -# %%cmake_build, be careful when running additional commands later... -%cmake -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ %if %{?_with_debug:1}%{!?_with_debug:0} - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else - -DCMAKE_BUILD_TYPE=RELEASE +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" %endif -%cmake_build +cmake .. \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + $CMAKE_OPTS + +make %{?jobs:-j%jobs} %install -%cmake_install -install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ + +cd build +make install DESTDIR="$RPM_BUILD_ROOT" install -m0755 -d %{buildroot}/%{_libdir}/yui -install -m0644 COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0644 ../COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ %post -n %{bin_name} -p /sbin/ldconfig %postun -n %{bin_name} -p /sbin/ldconfig @@ -131,10 +129,7 @@ %license %{_docdir}/%{bin_name}/COPYING* %files devel -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_includedir}/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/qt-rest-api %changelog ++++++ libyui-qt-rest-api-0.2.4.tar.bz2 -> libyui-qt-rest-api-4.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/CMakeLists.txt new/libyui-qt-rest-api-4.0.1/CMakeLists.txt --- old/libyui-qt-rest-api-0.2.4/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/CMakeLists.txt 2021-02-15 16:41:37.000000000 +0100 @@ -0,0 +1,60 @@ +# CMakeLists.txt for libyui-qt-rest-api +# +# Usage: +# +# mkdir build +# cd build +# cmake .. +# +# make +# sudo make install +# +# Restart with a clean build environment: +# rm -rf build +# +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +cmake_minimum_required( VERSION 3.10 ) +project( libyui-qt-rest-api ) + +# Options usage: +# +# cmake -DBUILD_DOC=on -DBUILD_EXAMPLES=off .. + +option( BUILD_SRC "Build in src/ subdirectory" on ) +option( BUILD_DOC "Build class documentation" off ) +option( WERROR "Treat all compiler warnings as errors" on ) + +# Non-boolean options +set( DOC_DESTDIR "" CACHE STRING "Destination directory prefix for installing docs" ) + +#---------------------------------------------------------------------- + + +# As of now, no support for /usr/local instead of /usr. But CMake DESTDIR works. +set( CMAKE_INSTALL_PREFIX /usr ) + +set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make install" + + +# Initialize compiler flags for all targets in all subdirectories +add_compile_options( "-Wall" ) +add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds) + +if ( WERROR ) + add_compile_options( "-Werror" ) +endif() + + +# +# Descend into subdirectories +# + +if ( BUILD_SRC ) + add_subdirectory( src ) +endif() + +if ( BUILD_DOC ) + add_subdirectory( doc ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/Makefile.cvs new/libyui-qt-rest-api-4.0.1/Makefile.cvs --- old/libyui-qt-rest-api-0.2.4/Makefile.cvs 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -# -# Makefile.cvs -# - -all: configure - -configure: clean - ./bootstrap.sh ; \ - mkdir build ; \ - cd build ; \ - cmake -DCMAKE_BUILD_TYPE=RELEASE .. - -install: configure - cd build ; \ - make && make install - -reconf: - cd build ; \ - cmake rebuild_cache - -clean: - rm -rf build \ - CMakeLists.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/Makefile.repo new/libyui-qt-rest-api-4.0.1/Makefile.repo --- old/libyui-qt-rest-api-0.2.4/Makefile.repo 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/Makefile.repo 2021-02-15 16:41:37.000000000 +0100 @@ -0,0 +1,63 @@ +# +# Makefile.repo for libyui-qt-rest-api +# + +# Local Variables: +# mode: Makefile +# End: + + +all: clean configure build-hint + +build-hint: + @echo "" + @echo "To build:" + @echo "" + @echo " cd build" + @echo " make" + @echo "" + +configure: + mkdir build; \ + cd build; \ + cmake .. + +build: clean configure + cd build; \ + make -j $$(nproc) + +# This needs root privileges, of course +install: configure + cd build; \ + make -j $$(nproc) && make install + +clean: + rm -rf build + +package: + rake package + +doc: + test -d build || mkdir build + cd build; \ + cmake -DBUILD_DOC=on .. ; \ + make doc + +install-doc: doc + cd build; \ + make install-doc + +version-bump: + rake version:bump + +# Just an alias +bump-version: version-bump + + +# Enforce rebuilding some targets unconditionally, even if a file or directory +# with that name exists; otherwise the timestamp of that file or directory +# would be checked. +# +# We need this because we have a subdirectory doc/, a subdirectory package/ +# and possibly a subdirectory build/ here. +.PHONY: doc package build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/PROJECTINFO.cmake new/libyui-qt-rest-api-4.0.1/PROJECTINFO.cmake --- old/libyui-qt-rest-api-0.2.4/PROJECTINFO.cmake 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/PROJECTINFO.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -##### PROJECTINFO for CMake - -SET( BASELIB "yui" ) # don't change this - -##### MAKE ALL NEEDED CHANGES HERE ##### - -SET( PLUGINNAME qt-rest-api ) -SET( SUBDIRS src ) -SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets Qt5Svg Qt5X11Extras ) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line -SET( LIB_LINKER dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too! -SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here. -SET( INTERNAL_DEPS Libyui Libyui-rest-api Libyui-qt ) -SET( URL "http://github.com/libyui/" ) -SET( SUMMARY "GUI-abstraction library - the REST API bindings for the Qt UI plugin" ) -SET( DESCRIPTION "This is the REST API plugin for the Qt UI." ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/Rakefile new/libyui-qt-rest-api-4.0.1/Rakefile --- old/libyui-qt-rest-api-0.2.4/Rakefile 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/Rakefile 2021-02-15 16:41:37.000000000 +0100 @@ -1,6 +1,16 @@ -# -*- coding: utf-8 -*- -# make continuous integration using rubygem-packaging_rake_tasks and -# rubygem-libyui-rake. -# Copyright �� 2014 SUSE LLC - +#-- +# Copyright (c) 2015-2019 SUSE LLC +# Copyright (c) 2020-2021 SUSE LLC +# +# make continuous integration using rubygem-libyui-rake. +# +# MIT license +#++ require "libyui/rake" + +Libyui::Tasks.configuration do |conf| + include Libyui::Tasks::Helpers + + conf.skip_license_check << /^Makefile\.repo$/ + conf.skip_license_check << /CMakeLists\.txt$/ +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/SOURCECONF.cmake new/libyui-qt-rest-api-4.0.1/SOURCECONF.cmake --- old/libyui-qt-rest-api-0.2.4/SOURCECONF.cmake 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/SOURCECONF.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -SET( ${TARGETLIB}_SOURCES - YQHttpUI.cc - YQHttpWidgetsActionHandler.cc - YQTableActionHandler.cc - YQWidgetActionHandler.cc -) - -SET( ${TARGETLIB}_HEADERS - YQHttpUI.h - YQHttpWidgetsActionHandler.h - YQTableActionHandler.h - YQWidgetActionHandler.h -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/VERSION.cmake new/libyui-qt-rest-api-4.0.1/VERSION.cmake --- old/libyui-qt-rest-api-0.2.4/VERSION.cmake 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/VERSION.cmake 2021-02-15 16:41:37.000000000 +0100 @@ -1,14 +1,9 @@ -SET( VERSION_MAJOR "0") -SET( VERSION_MINOR "2" ) -SET( VERSION_PATCH "4" ) -SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) +SET( VERSION_MAJOR "4") +SET( VERSION_MINOR "0" ) +SET( VERSION_PATCH "1" ) +SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -##### This is need for the libyui core ONLY. -##### These will be overridden from exports in LibyuiConfig.cmake -# Currently you must also change so_version in libyui.spec -# *and also in **all** other* libyui-*.spec files in the other repositories. -# Yes, such a design is suboptimal. -SET( SONAME_MAJOR "0" ) +SET( SONAME_MAJOR "15" ) SET( SONAME_MINOR "0" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/bootstrap.sh new/libyui-qt-rest-api-4.0.1/bootstrap.sh --- old/libyui-qt-rest-api-0.2.4/bootstrap.sh 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -#!/bin/sh -set -e - -prefix="/usr" - -if [ ! -z $1 ] -then - prefix="$1" -fi - -cmake_common="$prefix/share/libyui/buildtools/CMakeLists.common" -cmake_target="./CMakeLists.txt" - -echo "checking for $cmake_common..." - -if [ -f "$cmake_common" ] -then - ln -fs "$cmake_common" "$cmake_target" - echo "OK: linked to `pwd`/$cmake_target." -else - echo " Use must have libyui(-devel) >= 3.0.4 installed" - echo " in \"$prefix\" first !!!" - exit 1 -fi - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/doc/CMakeLists.txt new/libyui-qt-rest-api-4.0.1/doc/CMakeLists.txt --- old/libyui-qt-rest-api-0.2.4/doc/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/doc/CMakeLists.txt 2021-02-15 16:41:37.000000000 +0100 @@ -0,0 +1,42 @@ +# CMakeLists.txt for libyui-qt-rest-api/doc + +include( ../VERSION.cmake ) + +find_package( Doxygen REQUIRED dot ) + + +set( PKG_NAME libyui-qt-rest-api${SONAME_MAJOR} ) +set( DOC_INSTALL_DIR ${DOC_DESTDIR}/usr/share/doc/packages/${PKG_NAME} ) + + +# +# Doxygen-generated autodocs +# + +if ( DOXYGEN_FOUND ) + + set( DOXYGEN_GENERATE_TREEVIEW yes ) # Enable views tree HTML frame + set( DOXYGEN_QUIET yes ) # Less verbose output + set( DOXYGEN_WARN_LOGFILE doxygen-warnings.log ) + # See build/CMakeDoxyfile.in for more supported variables + + doxygen_add_docs( doc ../src ) + +else() + message( WARNING "Missing doxygen package" ) +endif() + + +# Define a new custom make target "install-doc". +# Notice that we can't use DESTDIR here since CMake only sets that +# for "make install", not for this custom "make install-doc". +# https://gist.github.com/shundhammer/12b6343309544a5920f51cd0063eeecf + +add_custom_target( install-doc + DEPENDS doc + + COMMAND mkdir -m 755 -p ${DOC_INSTALL_DIR}/html + COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/html ${DOC_INSTALL_DIR} + + COMMENT "Installing documentation to ${DOC_INSTALL_DIR}" ) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/package/libyui-qt-rest-api.changes new/libyui-qt-rest-api-4.0.1/package/libyui-qt-rest-api.changes --- old/libyui-qt-rest-api-0.2.4/package/libyui-qt-rest-api.changes 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/package/libyui-qt-rest-api.changes 2021-02-15 16:41:37.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Mon Feb 15 15:25:55 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- Require libyui-qt (bsc#1181653) +- 4.0.1 + +------------------------------------------------------------------- +Mon Feb 1 14:59:19 UTC 2021 - Stefan Hundhammer <shundhammer(a)suse.com> + +- New CMake build environment (bsc#1181653) +- Bumped SO version to 15 +- 4.0.0 + +------------------------------------------------------------------- Thu Nov 26 13:43:21 UTC 2020 - Rodion Iafarov <riafarov(a)suse.com> - Add activation for YTable (bsc#1139747) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/package/libyui-qt-rest-api.spec new/libyui-qt-rest-api-4.0.1/package/libyui-qt-rest-api.spec --- old/libyui-qt-rest-api-0.2.4/package/libyui-qt-rest-api.spec 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/package/libyui-qt-rest-api.spec 2021-02-15 16:41:37.000000000 +0100 @@ -2,6 +2,7 @@ # spec file for package libyui-qt-rest-api # # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020-2021 SUSE LLC, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,49 +17,47 @@ # -%define so_version 14 -%define bin_name %{name}%{so_version} -%define libyui_devel_version libyui-devel >= 3.10.1 - Name: libyui-qt-rest-api -Version: 0.2.4 + +# DO NOT manually bump the version here; instead, use rake version:bump +Version: 4.0.1 Release: 0 -Summary: Libyui - The REST API plugin for the Qt frontend -License: LGPL-2.1-only OR LGPL-3.0-only -Group: System/Libraries -URL: http://github.com/libyui/libyui-qt-rest-api -Source: %{name}-%{version}.tar.bz2 +%define so_version 15 +%define libyui_devel_version libyui-devel >= 3.10.1 +%define bin_name %{name}%{so_version} + +BuildRequires: cmake >= 3.10 +BuildRequires: gcc-c++ +BuildRequires: boost-devel +BuildRequires: libyui-qt-devel +BuildRequires: libyui-rest-api-devel BuildRequires: %{libyui_devel_version} -BuildRequires: cmake >= 2.8 -BuildRequires: fontconfig-devel + BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: gcc-c++ -BuildRequires: libyui-qt-devel -BuildRequires: libyui-rest-api-devel -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -BuildRequires: libboost_test-devel -%else -BuildRequires: boost-devel -%endif + +Summary: Libyui - The REST API plugin for the Qt frontend +License: LGPL-2.1-only OR LGPL-3.0-only +URL: http://github.com/libyui/ +Source: %{name}-%{version}.tar.bz2 %description -This package provides a libyui REST API plugin. +This package provides a libyui REST API plugin for the Qt frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package -n %{bin_name} Summary: Libyui - The REST API plugin for the Qt frontend -Group: System/Libraries -URL: http://github.com/libyui/libyui-qt-rest-api + Requires: libyui%{so_version} +Requires: libyui-qt%{so_version} Requires: libyui-rest-api%{so_version} Requires: yui_backend = %{so_version} Provides: %{name} = %{version} @@ -68,73 +67,75 @@ This package provides a libyui REST API plugin for the Qt frontend. It allows inspecting and controlling the UI remotely via -an HTTP REST API, it is designed for automated tests. +an HTTP REST API. This is designed for automated tests. + %package devel -Summary: Libyui header files -Group: Development/Languages/C and C++ -URL: http://github.com/libyui/libyui-qt-rest-api -BuildRequires: libyui-rest-api-devel +Summary: Libyui - Header files for the Qt REST API plugin + Requires: %{bin_name} = %{version} Requires: glibc-devel Requires: libstdc++-devel Requires: libyui-qt-devel Requires: libyui-rest-api-devel -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -Requires: libboost_test-devel -%else -Requires: boost-devel -%endif + %description devel -This package provides a libyui REST API plugin for the Qt frontend. +This provides a libyui REST API plugin for the Qt frontend. + +This package contains the header files for the plugin. + +This is not needed for using the REST API, only for developing +extensions for it. -This is a development subpackage. %prep %setup -q %build -export CFLAGS="%{optflags} -DNDEBUG" -export CXXFLAGS="%{optflags} -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -./bootstrap.sh %{_prefix} +mkdir build +cd build -# NOTE: %%cmake changes the CWD to "build" which is later expected by -# %%cmake_build, be careful when running additional commands later... -%cmake -DYPREFIX=%{_prefix} \ - -DDOC_DIR=%{_docdir} \ - -DLIB_DIR=%{_lib} \ %if %{?_with_debug:1}%{!?_with_debug:0} - -DCMAKE_BUILD_TYPE=RELWITHDEBINFO +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" %else - -DCMAKE_BUILD_TYPE=RELEASE +CMAKE_OPTS="-DCMAKE_BUILD_TYPE=RELEASE" %endif -%cmake_build +cmake .. \ + -DDOC_DIR=%{_docdir} \ + -DLIB_DIR=%{_lib} \ + $CMAKE_OPTS + +make %{?jobs:-j%jobs} + %install -%cmake_install -install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ + +cd build +make install DESTDIR="$RPM_BUILD_ROOT" install -m0755 -d %{buildroot}/%{_libdir}/yui -install -m0644 COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0755 -d %{buildroot}/%{_docdir}/%{bin_name}/ +install -m0644 ../COPYING* %{buildroot}/%{_docdir}/%{bin_name}/ + %post -n %{bin_name} -p /sbin/ldconfig %postun -n %{bin_name} -p /sbin/ldconfig + %files -n %{bin_name} %dir %{_libdir}/yui %{_libdir}/yui/lib*.so.* %doc %dir %{_docdir}/%{bin_name} %license %{_docdir}/%{bin_name}/COPYING* + %files devel -%dir %{_docdir}/%{bin_name} %{_libdir}/yui/lib*.so -%{_includedir}/yui -%{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/cmake/%{name} +%{_includedir}/yui/qt-rest-api %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/CMakeLists.txt new/libyui-qt-rest-api-4.0.1/src/CMakeLists.txt --- old/libyui-qt-rest-api-0.2.4/src/CMakeLists.txt 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/CMakeLists.txt 2021-02-15 16:41:37.000000000 +0100 @@ -1,10 +1,151 @@ -# Find includes in corresponding build directories -set( CMAKE_INCLUDE_CURRENT_DIR ON ) +# CMakeLists.txt for libyui-qt-rest-api/src -# Instruct CMake to run moc automatically when needed. -set( CMAKE_AUTOMOC ON ) +include( ../VERSION.cmake ) +include( GNUInstallDirs ) # set CMAKE_INSTALL_INCLUDEDIR, ..._LIBDIR -PROCESS_SOURCES() -target_link_libraries( - ${TARGETLIB} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::X11Extras +# +# Qt-specific +# + +# We only link against Qt5::Core, but we need Qt5::Widgets for the include dir +# for <yui/qt/YQ*.h> headers that use them +find_package( Qt5 COMPONENTS Widgets REQUIRED ) + +set( CMAKE_AUTOMOC on ) # Automatically handle "moc" preprocessor (Q_OBJECTs) + + +# +# libyui-rest-api plugin specific +# + +set( TARGETLIB libyui-qt-rest-api ) +set( TARGETLIB_BASE yui-qt-rest-api ) + +set( HEADERS_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/yui/qt-rest-api ) +set( PLUGIN_DIR ${CMAKE_INSTALL_LIBDIR}/yui ) # /usr/lib64/yui + +# if DESTDIR is set, CMAKE_INSTALL_INCLUDEDIR already contains it +# during "make install" (but not for other make targets!): +# +# sudo make install DESTDIR=/work/foo +# or +# DESTDIR=/work/foo sudo make install +# +# -> the include files are installed to /work/foo/usr/include/... +# We need that for RPM builds to install everything to $RPM_BUILD_ROOT. + + +set( SOURCES + YQHttpUI.cc + YQHttpWidgetsActionHandler.cc + YQTableActionHandler.cc + YQWidgetActionHandler.cc + ) + + +set( HEADERS + YQHttpUI.h + YQHttpWidgetsActionHandler.h + YQTableActionHandler.h + YQWidgetActionHandler.h + ) + + +# Add shared lib to be built +add_library( ${TARGETLIB} SHARED + ${SOURCES} + ${HEADERS} + ) + + +# +# Include directories and compile options +# + +set( LOCAL_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include ) + +# Create an include dir with some symlinks to include headers from sibling projects: +# build/src/include/yui/qt -> ../../libyui-qt/src +# build/src/include/yui/rest-api -> ../../libyui-rest-api/src +# build/src/include/yui/yui -> ../../libyui/src +add_custom_target( local-include-dir + COMMAND rm -rf ${LOCAL_INCLUDE_DIR} + COMMAND mkdir -p ${LOCAL_INCLUDE_DIR}/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui/src ${LOCAL_INCLUDE_DIR}/yui/yui + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-qt/src ${LOCAL_INCLUDE_DIR}/yui/qt + COMMAND ln -s ${CMAKE_CURRENT_SOURCE_DIR}/../../libyui-rest-api/src ${LOCAL_INCLUDE_DIR}/yui/rest-api ) + +add_dependencies( ${TARGETLIB} local-include-dir ) + +# <yui/qt/YQFoo.h> from build/src/include/yui/qt -> ../../libyui-qt/src +# <yui/rest-api/YRestFoo.h> from build/src/include/yui/rest-api -> ../../libyui-rest-api/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR} ) + +# <yui/YFoo.h> from build/src/include/yui/yui -> ../../libyui/src +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${LOCAL_INCLUDE_DIR}/yui ) + + +# FIXME start +# Also add those directories directly until the full transition is done: +# The headers of older libyui-rest-api packages still #include "YSomeWidget.h" +target_include_directories( ${TARGETLIB} BEFORE PUBLIC /usr/include/yui ) +# Remove this when those old packages are history. +# FIXME end + +# Make the version from ../VERSION.cmake available as a #define +target_compile_definitions( ${TARGETLIB} PUBLIC VERSION="${VERSION}" ) + +# We need the headers for QApplication etc. for the <yui/qt/YQ*.h> headers, +# but we don't need to link against Qt5::Widgets, only Qt5::Core +target_include_directories( ${TARGETLIB} BEFORE PUBLIC ${Qt5Widgets_INCLUDE_DIRS}) + +# Add more compile options to this target in addition to those +# added in the toplevel CMakeLists.txt. +# +# Notice that CMake will automatically add -fPIC etc. where needed, +# like for this shared lib. +### target_compile_options( ${TARGETLIB} PUBLIC "-Dfoo" ) + +# Show the complete compiler commands with all arguments: +# make VERBOSE=1 + +# Add more compile options to an individual source file: +### set_source_files_properties( YUI.cc PROPERTIES COMPILE_OPTIONS "-Dfoo" ) + + +# +# Linking +# + +# Find yui during a combined build +target_link_directories( ${TARGETLIB} BEFORE PUBLIC ../../libyui/build/src ) + + +# Libraries that are needed to build this shared lib +# +# If in doubt what is really needed, check with "ldd -u" which libs are unused. +target_link_libraries( ${TARGETLIB} + yui + Qt5::Core + ) + +# We are not using any of Qt5::Widgets or Qt5::Gui here; we only needed +# Qt5::Widgets for its include files which are used from <yui/qt/YQ*.h> +# headers. + + +# https://cmake.org/cmake/help/latest/manual/cmake-properties.7.html#target-p… +set_target_properties( ${TARGETLIB} PROPERTIES + VERSION ${SONAME} # From ../VERSION.cmake + SOVERSION ${SONAME_MAJOR} # From ../VERSION.cmake + OUTPUT_NAME ${TARGETLIB_BASE} ) + + +# +# Install +# + +# Install the headers first so the message about the lib does not scroll away +install( FILES ${HEADERS} DESTINATION ${HEADERS_INSTALL_DIR} ) +install( TARGETS ${TARGETLIB} LIBRARY DESTINATION ${PLUGIN_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQHttpUI.cc new/libyui-qt-rest-api-4.0.1/src/YQHttpUI.cc --- old/libyui-qt-rest-api-0.2.4/src/YQHttpUI.cc 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQHttpUI.cc 2021-02-15 16:41:37.000000000 +0100 @@ -13,18 +13,19 @@ Floor, Boston, MA 02110-1301 USA */ -#define YUILogComponent "qt-rest-api" #include <QThread> #include <QSocketNotifier> + +#define YUILogComponent "qt-rest-api" #include <yui/YUILog.h> -#include <yui/Libyui_config.h> -#include "YHttpServer.h" +#include <yui/rest-api/YHttpServer.h> + #include "YQHttpUI.h" -#include "YQUI.h" #include "YQHttpWidgetsActionHandler.h" + YQHttpUI::YQHttpUI( bool withThreads ) : YQUI( withThreads, false ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQHttpUI.h new/libyui-qt-rest-api-4.0.1/src/YQHttpUI.h --- old/libyui-qt-rest-api-0.2.4/src/YQHttpUI.h 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQHttpUI.h 2021-02-15 16:41:37.000000000 +0100 @@ -25,7 +25,8 @@ #ifndef YQHttpUI_h #define YQHttpUI_h -#include "YQUI.h" +#include <yui/qt/YQUI.h> + //! The class of a pointer expression. // To be used in connect(foo, &pclass(foo)::mysignal, bar, &pclass(bar)::myslot); @@ -36,8 +37,6 @@ class QSocketNotifier; class YQHttpUISignalReceiver; -using std::string; -using std::vector; class YQHttpUI: public YQUI { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQHttpWidgetsActionHandler.cc new/libyui-qt-rest-api-4.0.1/src/YQHttpWidgetsActionHandler.cc --- old/libyui-qt-rest-api-0.2.4/src/YQHttpWidgetsActionHandler.cc 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQHttpWidgetsActionHandler.cc 2021-02-15 16:41:37.000000000 +0100 @@ -14,14 +14,9 @@ Floor, Boston, MA 02110-1301 USA */ -#ifndef YUILogComponent -#define YUILogComponent "qt-rest-api" -#endif //YUILogComponent - -#include "YUILog.h" - #include "YQHttpWidgetsActionHandler.h" + YWidgetActionHandler* YQHttpWidgetsActionHandler::get_widget_handler() { if( !widget_action_handler ){ widget_action_handler = new YQWidgetActionHandler(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQHttpWidgetsActionHandler.h new/libyui-qt-rest-api-4.0.1/src/YQHttpWidgetsActionHandler.h --- old/libyui-qt-rest-api-0.2.4/src/YQHttpWidgetsActionHandler.h 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQHttpWidgetsActionHandler.h 2021-02-15 16:41:37.000000000 +0100 @@ -17,11 +17,12 @@ #ifndef YQHttpWidgetsActionHandler_h #define YQHttpWidgetsActionHandler_h -#include "YHttpWidgetsActionHandler.h" +#include <yui/rest-api/YHttpWidgetsActionHandler.h> #include "YQWidgetActionHandler.h" #include "YQTableActionHandler.h" + class YQHttpWidgetsActionHandler : public YHttpWidgetsActionHandler { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQTableActionHandler.cc new/libyui-qt-rest-api-4.0.1/src/YQTableActionHandler.cc --- old/libyui-qt-rest-api-0.2.4/src/YQTableActionHandler.cc 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQTableActionHandler.cc 2021-02-15 16:41:37.000000000 +0100 @@ -14,9 +14,11 @@ Floor, Boston, MA 02110-1301 USA */ +#include <yui/YEvent.h> + +#include "YQHttpUI.h" #include "YQTableActionHandler.h" -#include <yui/YEvent.h> void YQTableActionHandler::activate_widget( YTable * widget, YItem * item ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQTableActionHandler.h new/libyui-qt-rest-api-4.0.1/src/YQTableActionHandler.h --- old/libyui-qt-rest-api-0.2.4/src/YQTableActionHandler.h 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQTableActionHandler.h 2021-02-15 16:41:37.000000000 +0100 @@ -17,15 +17,8 @@ #ifndef YQTableActionHandler_h #define YQTableActionHandler_h -#include <iostream> -#include <functional> -#include <microhttpd.h> -#include <sstream> +#include <yui/rest-api/YTableActionHandler.h> -#include "YQHttpUI.h" -#include "YTableActionHandler.h" - -#include <boost/algorithm/string.hpp> class YQTableActionHandler : public YTableActionHandler { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQWidgetActionHandler.cc new/libyui-qt-rest-api-4.0.1/src/YQWidgetActionHandler.cc --- old/libyui-qt-rest-api-0.2.4/src/YQWidgetActionHandler.cc 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQWidgetActionHandler.cc 2021-02-15 16:41:37.000000000 +0100 @@ -16,6 +16,7 @@ #include "YQWidgetActionHandler.h" + void YQWidgetActionHandler::activate_widget( YCheckBoxFrame * widget ) { widget->handleChildrenEnablement( widget->value() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-rest-api-0.2.4/src/YQWidgetActionHandler.h new/libyui-qt-rest-api-4.0.1/src/YQWidgetActionHandler.h --- old/libyui-qt-rest-api-0.2.4/src/YQWidgetActionHandler.h 2020-11-30 09:55:22.000000000 +0100 +++ new/libyui-qt-rest-api-4.0.1/src/YQWidgetActionHandler.h 2021-02-15 16:41:37.000000000 +0100 @@ -17,16 +17,10 @@ #ifndef YQWidgetActionHandler_h #define YQWidgetActionHandler_h -#include <iostream> -#include <functional> -#include <microhttpd.h> -#include <sstream> #include <yui/YEvent.h> - +#include <yui/rest-api/YWidgetActionHandler.h> #include "YQHttpUI.h" -#include "YWidgetActionHandler.h" -#include <boost/algorithm/string.hpp> class YQWidgetActionHandler : public YWidgetActionHandler {

1 0