Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=08ab700...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=353853f....
Change:
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+ExcludeArch: ppc s390 ppc64 i686
Thanks.
Full change:
============
commit a3d1d236a2160cc4f1ed12658847d3830ff315af
Merge: 341f4a7 f202367
Author: Chenxiong Qi <cqi(a)redhat.com>
Date: Wed Mar 20 22:41:34 2019 +0800
Build release 0.2.1
diff --cc sources
index f552a64,5a99535..ce6e182
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,1 @@@
- SHA512 (ursa-major-0.1.1.tar.gz) = 6515eab4a9b3bdf0acb055a36bb2b76f4387cef9c4aff3f75c87555d7afa2897feb4feba1d26a588db26a1321fb473a570c876991890489a91d96f579c8ba3c2
-16a520fbedfd2d51815f44cb4219fad3 ursa-major-0.2.1.tar.gz
++SHA512 (ursa-major-0.2.1.tar.gz) = 27231d31e39d035cdd0573ff45d39c3d1346c5d8e1ac3e4970b5bf147255dfe26f457e2a78414c0a5046e952a14a52a25cd696f8e0895a1ef56c86d1c085911e
diff --cc ursa-major.spec
index edd8857,9137dd6..ffc1ae2
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@@ -179,12 -183,21 +185,27 @@@ py.tes
%changelog
+ * Wed Mar 20 2019 Chenxiong Qi <cqi(a)redhat.com> - 0.2.1-1
+ - Make setup_method/teardown_method compatible with newer version of pytest (Chenxiong Qi)
+ - Add missing file CHANGELOG.rst to sdist package (Chenxiong Qi)
+
+ * Wed Mar 20 2019 Chenxiong Qi <cqi(a)redhat.com> - 0.2.0-1
+ - Add tests for AddModuleHandler methods (Chenxiong Qi)
+ - Avoid long modulemd embedded into fake data for tests (Chenxiong Qi)
+ - Fixes according to review comments (Chenxiong Qi)
+ - Command check-config supports filtering modules on buildrequires (Chenxiong Qi)
+ - Command add-module supports buildrequires now (Chenxiong Qi)
+ - Command remove-module supports filtering modules on buildrequires (Chenxiong Qi)
+ - Allow passing buildrequires to MBS.get_modules_with_requires (Chenxiong Qi)
+ - Reword remove-module help and --tag option help text (Chenxiong Qi)
+ - Allow filtering on buildrequires (Chenxiong Qi)
+
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
+- build can be scheduled to i386 arch, include ix86
+
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
+- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit f202367a03a4334c9f931d37a9f2fac52a179533
Author: Chenxiong Qi <cqi(a)redhat.com>
Date: Wed Mar 20 21:39:45 2019 +0800
Require libmodulemd1 in Fedora and RHEL>7
Ursa-Major uses libmodulemd version 1.0 API. That is shipped in a separate
package named libmodulemd1 since 2.x, which are available in Fedora and
RHEL>7.
diff --git a/ursa-major.spec b/ursa-major.spec
index 0860e2e..9137dd6 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -20,7 +20,6 @@ ExcludeArch: ppc s390 ppc64 i686
BuildRequires: help2man
-BuildRequires: libmodulemd
%if 0%{?with_python3}
BuildRequires: python3-devel
@@ -60,10 +59,17 @@ BuildRequires: python2-mock
%endif
%endif
+%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} > 7)
+BuildRequires: libmodulemd1
+Requires: libmodulemd1
+%else
+BuildRequires: libmodulemd
+Requires: libmodulemd
+%endif
+
Requires: gobject-introspection
Requires: krb5-workstation
Requires: koji
-Requires: libmodulemd
Requires: m2crypto
%if 0%{?with_python3}
commit 353853f908cee907e8c703a143820b2e1d12e4a6
Author: Chenxiong Qi <cqi(a)redhat.com>
Date: Wed Mar 20 17:21:45 2019 +0800
Release 0.2.1
diff --git a/.gitignore b/.gitignore
index b3ec1d3..7c33d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/ursa-major-0.1.1.tar.gz
+/ursa-major-0.2.0.tar.gz
+/ursa-major-0.2.1.tar.gz
diff --git a/sources b/sources
index db0228d..5a99535 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4254c1f1054b2b95a8e14dbe98342e35 ursa-major-0.1.1.tar.gz
+16a520fbedfd2d51815f44cb4219fad3 ursa-major-0.2.1.tar.gz
diff --git a/ursa-major.spec b/ursa-major.spec
index acd3103..0860e2e 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -5,8 +5,8 @@
%endif
Name: ursa-major
-Version: 0.1.1
-Release: 2%{?dist}
+Version: 0.2.1
+Release: 1%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance.
Group: Development/Tools
@@ -16,7 +16,7 @@ Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{v
BuildArch: noarch
# libmodulemd is not available for ppc or i686
-ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+ExcludeArch: ppc s390 ppc64 i686
BuildRequires: help2man
@@ -142,9 +142,9 @@ export PYTHONPATH=%{buildroot}%{python2_sitelib}
%endif
mkdir -p %{buildroot}/%{_mandir}/man1
-help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
+help2man -N --no-discard-stderr --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
for cmd in show-config check-config remove-module add-module add-tag; do
- help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
+ help2man -N --no-discard-stderr --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
done
@@ -177,6 +177,21 @@ py.test
%changelog
+* Wed Mar 20 2019 Chenxiong Qi <cqi(a)redhat.com> - 0.2.1-1
+- Make setup_method/teardown_method compatible with newer version of pytest (Chenxiong Qi)
+- Add missing file CHANGELOG.rst to sdist package (Chenxiong Qi)
+
+* Wed Mar 20 2019 Chenxiong Qi <cqi(a)redhat.com> - 0.2.0-1
+- Add tests for AddModuleHandler methods (Chenxiong Qi)
+- Avoid long modulemd embedded into fake data for tests (Chenxiong Qi)
+- Fixes according to review comments (Chenxiong Qi)
+- Command check-config supports filtering modules on buildrequires (Chenxiong Qi)
+- Command add-module supports buildrequires now (Chenxiong Qi)
+- Command remove-module supports filtering modules on buildrequires (Chenxiong Qi)
+- Allow passing buildrequires to MBS.get_modules_with_requires (Chenxiong Qi)
+- Reword remove-module help and --tag option help text (Chenxiong Qi)
+- Allow filtering on buildrequires (Chenxiong Qi)
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 08ab7009862ffe097af23e6a84b89aefe8f0b048
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Tue Nov 20 15:38:36 2018 +0800
Limit build arches and update requires
diff --git a/ursa-major.spec b/ursa-major.spec
index 7cfedb3..acd3103 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance.
Group: Development/Tools
@@ -14,7 +14,9 @@ License: MIT
URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
-BuildArch: noarch
+BuildArch: noarch
+# libmodulemd is not available for ppc or i686
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
BuildRequires: help2man
@@ -35,7 +37,6 @@ BuildRequires: python3-mock
%else
BuildRequires: python2-devel
BuildRequires: python2-koji
-BuildRequires: python2-psutil
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: python-setuptools
BuildRequires: python-gobject-base
@@ -64,7 +65,6 @@ Requires: krb5-workstation
Requires: koji
Requires: libmodulemd
Requires: m2crypto
-Requires: fedora-packager
%if 0%{?with_python3}
Requires: python3-gobject-base
@@ -73,10 +73,8 @@ Requires: python3-koji
Requires: python3-six
Requires: python3-requests
Requires: python3-jinja2
-Requires: python3-psutil
%else
Requires: python2-koji
-Requires: python2-psutil
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: python-gobject-base
Requires: pycairo
@@ -179,5 +177,8 @@ py.test
%changelog
+* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
+- Limit build arches as libmodulemd is not available for ppc or i686
+
* Fri Oct 26 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-1
- Initial version of spec file
commit fa0ae4490547e20f9fecad99a3adba8b75c2a665
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Fri Nov 9 19:20:21 2018 +0800
Initial import
diff --git a/.gitignore b/.gitignore
index e69de29..b3ec1d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/ursa-major-0.1.1.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..db0228d
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+4254c1f1054b2b95a8e14dbe98342e35 ursa-major-0.1.1.tar.gz
diff --git a/ursa-major.spec b/ursa-major.spec
new file mode 100644
index 0000000..7cfedb3
--- /dev/null
+++ b/ursa-major.spec
@@ -0,0 +1,183 @@
+%if 0%{?fedora}
+# we have some koji hubs doesn't support Python3 with kerberos auth
+# at this moment, so we build with Python2 for all platforms now
+%global with_python3 0
+%endif
+
+Name: ursa-major
+Version: 0.1.1
+Release: 1%{?dist}
+Summary: A utility for working with module's koji tags in koji's tag inheritance.
+
+Group: Development/Tools
+License: MIT
+URL: https://pagure.io/ursa-major
+Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
+
+BuildArch: noarch
+
+
+BuildRequires: help2man
+BuildRequires: libmodulemd
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-gobject-base
+BuildRequires: python3-cairo
+BuildRequires: python3-koji
+BuildRequires: python3-six
+BuildRequires: python3-requests
+BuildRequires: python3-jinja2
+BuildRequires: python3-psutil
+BuildRequires: python3-pytest
+BuildRequires: python3-mock
+%else
+BuildRequires: python2-devel
+BuildRequires: python2-koji
+BuildRequires: python2-psutil
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-setuptools
+BuildRequires: python-gobject-base
+BuildRequires: pycairo
+BuildRequires: python-six
+BuildRequires: python-requests
+BuildRequires: python-jinja2
+BuildRequires: python-futures
+BuildRequires: pytest
+BuildRequires: python-mock
+%else
+BuildRequires: python2-setuptools
+BuildRequires: python2-gobject-base
+BuildRequires: python2-cairo
+BuildRequires: python2-six
+BuildRequires: python2-requests
+BuildRequires: python2-jinja2
+BuildRequires: python2-futures
+BuildRequires: python2-pytest
+BuildRequires: python2-mock
+%endif
+%endif
+
+Requires: gobject-introspection
+Requires: krb5-workstation
+Requires: koji
+Requires: libmodulemd
+Requires: m2crypto
+Requires: fedora-packager
+
+%if 0%{?with_python3}
+Requires: python3-gobject-base
+Requires: python3-cairo
+Requires: python3-koji
+Requires: python3-six
+Requires: python3-requests
+Requires: python3-jinja2
+Requires: python3-psutil
+%else
+Requires: python2-koji
+Requires: python2-psutil
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires: python-gobject-base
+Requires: pycairo
+Requires: python-six
+Requires: python-requests
+Requires: python-jinja2
+Requires: python-futures
+%else
+Requires: python2-gobject-base
+Requires: python2-cairo
+Requires: python2-six
+Requires: python2-requests
+Requires: python2-jinja2
+Requires: python2-futures
+%endif
+%endif
+
+
+%description
+Usra-Major can be used to edit a tag config file and update module's koji tags
+in koji's tag inheritance accordingly per the configuration in tag config file.
+
+
+%package -n ursa-major-stage
+Summary: A utility for working with module's koji tags in koji's tag inheritance.
+Requires: %{name} = %{version}-%{release}
+
+%description -n ursa-major-stage
+The ursa-major-stage package contains script and configurations for Ursa-Major
+to talk with Fedora's stage instances (Koji, MBS).
+
+
+%prep
+%setup -q
+
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# workaround for no egg-info
+sed -i '/pycairo/d' requirements.txt
+# old setuptools not support environment marker
+sed -i 's/futures.*/futures/' requirements.txt
+%endif
+
+# workaround for no egg-info
+sed -i '/koji/d' requirements.txt
+
+%build
+%if 0%{?with_python3}
+%py3_build
+%else
+%py2_build
+%endif
+
+
+%install
+%if 0%{?with_python3}
+%py3_install
+%else
+%py2_install
+%endif
+
+%if 0%{?with_python3}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%else
+export PYTHONPATH=%{buildroot}%{python2_sitelib}
+%endif
+mkdir -p %{buildroot}/%{_mandir}/man1
+
+help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
+for cmd in show-config check-config remove-module add-module add-tag; do
+ help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
+done
+
+
+%check
+%if 0%{?with_python3}
+py.test-3
+%else
+py.test
+%endif
+
+
+%files
+%doc README.rst
+%license LICENSE
+
+%if 0%{?with_python3}
+%{python3_sitelib}/ursa_major*
+%else
+%{python2_sitelib}/ursa_major*
+%endif
+
+%{_bindir}/ursa-major
+%dir %{_sysconfdir}/ursa-major
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major.conf
+%doc %{_mandir}/man1/ursa-major*.1*
+
+%files stage
+%{_bindir}/ursa-major-stage
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major-stage.conf
+
+
+%changelog
+* Fri Oct 26 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-1
+- Initial version of spec file
commit af97ad145cff5956cb312caf7ebba19ea895a526
Author: Release Configuration Management <release-engineering(a)redhat.com>
Date: Fri Nov 9 08:10:04 2018 +0000
Repo creation
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
5 years, 2 months
Architecture specific change in rpms/spausedd.git
by githook-noreply@fedoraproject.org
The package rpms/spausedd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/spausedd.git/commit/?id=1eaba7dcb....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 1eaba7dcb1ee89b21db05f77f84d2cabf7761120
Author: Jan Friesse <jfriesse(a)redhat.com>
Date: Wed Mar 20 16:31:48 2019 +0100
Initial import (#1690027).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12b6e72
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/spausedd-20190320.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..012ba75
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (spausedd-20190320.tar.gz) = a7f9863355a3106ea61c8b7e512c2bc895c8b5b07fb3d26f8feec8f963abb7a95230f83f9d27c6ac3aedaa9d91c6fb700bacc1ca59adfa769876168296241599
diff --git a/spausedd.spec b/spausedd.spec
new file mode 100644
index 0000000..1effaf8
--- /dev/null
+++ b/spausedd.spec
@@ -0,0 +1,96 @@
+%bcond_without vmguestlib
+
+Name: spausedd
+Summary: Utility to detect and log scheduler pause
+Version: 20190320
+Release: 1%{?dist}
+License: ISC
+URL: https://github.com/jfriesse/spausedd
+Source0: https://github.com/jfriesse/%{name}/releases/download/%{version}/%{name}-...
+
+# VMGuestLib exists only for x86 architectures
+%if %{with vmguestlib}
+%ifarch %{ix86} x86_64
+%global use_vmguestlib 1
+%endif
+%endif
+
+BuildRequires: gcc
+%{?systemd_requires}
+BuildRequires: systemd
+
+%if %{defined use_vmguestlib}
+BuildRequires: pkgconfig(vmguestlib)
+%endif
+
+%description
+Utility to detect and log scheduler pause
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%set_build_flags
+make \
+%if %{defined use_vmguestlib}
+ WITH_VMGUESTLIB=1 \
+%else
+ WITH_VMGUESTLIB=0 \
+%endif
+ %{?_smp_mflags}
+
+%install
+make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
+
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 755 -p init/%{name}.service %{buildroot}/%{_unitdir}
+
+%clean
+
+%files
+%doc AUTHORS
+%license COPYING
+%{_bindir}/%{name}
+%{_mandir}/man8/*
+%{_unitdir}/spausedd.service
+
+%post
+%systemd_post spausedd.service
+
+%preun
+%systemd_preun spausedd.service
+
+%postun
+%systemd_postun spausedd.service
+
+%changelog
+* Wed Mar 20 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190320-1
+- Use license macro in spec file
+
+* Tue Mar 19 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190319-1
+- Add AUTHORS and COPYING
+- Fix version number in specfile
+- Use install -p to preserve timestamps
+- Use set_build_flags macro
+- Rebase to new version
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-2
+- Initial version for Fedora
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-1
+- Require VMGuestLib only on x86 and x86_64
+
+* Wed Mar 21 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180321-1
+- Remove exlusivearch for VMGuestLib.
+- Add copr branch with enhanced spec file which tries to automatically
+ detect what build options should be used (systemd/vmguestlib).
+
+* Tue Mar 20 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180320-1
+- Add support for VMGuestLib
+- Add more examples
+
+* Mon Feb 19 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180219-1
+- Add support for steal time
+
+* Fri Feb 9 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180209-1
+- Initial version
5 years, 2 months
Architecture specific change in rpms/spausedd.git
by githook-noreply@fedoraproject.org
The package rpms/spausedd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/spausedd.git/commit/?id=1eaba7dcb....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 1eaba7dcb1ee89b21db05f77f84d2cabf7761120
Author: Jan Friesse <jfriesse(a)redhat.com>
Date: Wed Mar 20 16:31:48 2019 +0100
Initial import (#1690027).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12b6e72
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/spausedd-20190320.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..012ba75
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (spausedd-20190320.tar.gz) = a7f9863355a3106ea61c8b7e512c2bc895c8b5b07fb3d26f8feec8f963abb7a95230f83f9d27c6ac3aedaa9d91c6fb700bacc1ca59adfa769876168296241599
diff --git a/spausedd.spec b/spausedd.spec
new file mode 100644
index 0000000..1effaf8
--- /dev/null
+++ b/spausedd.spec
@@ -0,0 +1,96 @@
+%bcond_without vmguestlib
+
+Name: spausedd
+Summary: Utility to detect and log scheduler pause
+Version: 20190320
+Release: 1%{?dist}
+License: ISC
+URL: https://github.com/jfriesse/spausedd
+Source0: https://github.com/jfriesse/%{name}/releases/download/%{version}/%{name}-...
+
+# VMGuestLib exists only for x86 architectures
+%if %{with vmguestlib}
+%ifarch %{ix86} x86_64
+%global use_vmguestlib 1
+%endif
+%endif
+
+BuildRequires: gcc
+%{?systemd_requires}
+BuildRequires: systemd
+
+%if %{defined use_vmguestlib}
+BuildRequires: pkgconfig(vmguestlib)
+%endif
+
+%description
+Utility to detect and log scheduler pause
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%set_build_flags
+make \
+%if %{defined use_vmguestlib}
+ WITH_VMGUESTLIB=1 \
+%else
+ WITH_VMGUESTLIB=0 \
+%endif
+ %{?_smp_mflags}
+
+%install
+make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
+
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 755 -p init/%{name}.service %{buildroot}/%{_unitdir}
+
+%clean
+
+%files
+%doc AUTHORS
+%license COPYING
+%{_bindir}/%{name}
+%{_mandir}/man8/*
+%{_unitdir}/spausedd.service
+
+%post
+%systemd_post spausedd.service
+
+%preun
+%systemd_preun spausedd.service
+
+%postun
+%systemd_postun spausedd.service
+
+%changelog
+* Wed Mar 20 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190320-1
+- Use license macro in spec file
+
+* Tue Mar 19 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190319-1
+- Add AUTHORS and COPYING
+- Fix version number in specfile
+- Use install -p to preserve timestamps
+- Use set_build_flags macro
+- Rebase to new version
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-2
+- Initial version for Fedora
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-1
+- Require VMGuestLib only on x86 and x86_64
+
+* Wed Mar 21 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180321-1
+- Remove exlusivearch for VMGuestLib.
+- Add copr branch with enhanced spec file which tries to automatically
+ detect what build options should be used (systemd/vmguestlib).
+
+* Tue Mar 20 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180320-1
+- Add support for VMGuestLib
+- Add more examples
+
+* Mon Feb 19 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180219-1
+- Add support for steal time
+
+* Fri Feb 9 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180209-1
+- Initial version
5 years, 2 months
Architecture specific change in rpms/spausedd.git
by githook-noreply@fedoraproject.org
The package rpms/spausedd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/spausedd.git/commit/?id=1eaba7dcb....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 1eaba7dcb1ee89b21db05f77f84d2cabf7761120
Author: Jan Friesse <jfriesse(a)redhat.com>
Date: Wed Mar 20 16:31:48 2019 +0100
Initial import (#1690027).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12b6e72
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/spausedd-20190320.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..012ba75
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (spausedd-20190320.tar.gz) = a7f9863355a3106ea61c8b7e512c2bc895c8b5b07fb3d26f8feec8f963abb7a95230f83f9d27c6ac3aedaa9d91c6fb700bacc1ca59adfa769876168296241599
diff --git a/spausedd.spec b/spausedd.spec
new file mode 100644
index 0000000..1effaf8
--- /dev/null
+++ b/spausedd.spec
@@ -0,0 +1,96 @@
+%bcond_without vmguestlib
+
+Name: spausedd
+Summary: Utility to detect and log scheduler pause
+Version: 20190320
+Release: 1%{?dist}
+License: ISC
+URL: https://github.com/jfriesse/spausedd
+Source0: https://github.com/jfriesse/%{name}/releases/download/%{version}/%{name}-...
+
+# VMGuestLib exists only for x86 architectures
+%if %{with vmguestlib}
+%ifarch %{ix86} x86_64
+%global use_vmguestlib 1
+%endif
+%endif
+
+BuildRequires: gcc
+%{?systemd_requires}
+BuildRequires: systemd
+
+%if %{defined use_vmguestlib}
+BuildRequires: pkgconfig(vmguestlib)
+%endif
+
+%description
+Utility to detect and log scheduler pause
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%set_build_flags
+make \
+%if %{defined use_vmguestlib}
+ WITH_VMGUESTLIB=1 \
+%else
+ WITH_VMGUESTLIB=0 \
+%endif
+ %{?_smp_mflags}
+
+%install
+make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
+
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 755 -p init/%{name}.service %{buildroot}/%{_unitdir}
+
+%clean
+
+%files
+%doc AUTHORS
+%license COPYING
+%{_bindir}/%{name}
+%{_mandir}/man8/*
+%{_unitdir}/spausedd.service
+
+%post
+%systemd_post spausedd.service
+
+%preun
+%systemd_preun spausedd.service
+
+%postun
+%systemd_postun spausedd.service
+
+%changelog
+* Wed Mar 20 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190320-1
+- Use license macro in spec file
+
+* Tue Mar 19 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190319-1
+- Add AUTHORS and COPYING
+- Fix version number in specfile
+- Use install -p to preserve timestamps
+- Use set_build_flags macro
+- Rebase to new version
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-2
+- Initial version for Fedora
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-1
+- Require VMGuestLib only on x86 and x86_64
+
+* Wed Mar 21 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180321-1
+- Remove exlusivearch for VMGuestLib.
+- Add copr branch with enhanced spec file which tries to automatically
+ detect what build options should be used (systemd/vmguestlib).
+
+* Tue Mar 20 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180320-1
+- Add support for VMGuestLib
+- Add more examples
+
+* Mon Feb 19 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180219-1
+- Add support for steal time
+
+* Fri Feb 9 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180209-1
+- Initial version
5 years, 2 months
Architecture specific change in rpms/spausedd.git
by githook-noreply@fedoraproject.org
The package rpms/spausedd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/spausedd.git/commit/?id=1eaba7dcb....
Change:
+%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit 1eaba7dcb1ee89b21db05f77f84d2cabf7761120
Author: Jan Friesse <jfriesse(a)redhat.com>
Date: Wed Mar 20 16:31:48 2019 +0100
Initial import (#1690027).
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..12b6e72
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/spausedd-20190320.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..012ba75
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (spausedd-20190320.tar.gz) = a7f9863355a3106ea61c8b7e512c2bc895c8b5b07fb3d26f8feec8f963abb7a95230f83f9d27c6ac3aedaa9d91c6fb700bacc1ca59adfa769876168296241599
diff --git a/spausedd.spec b/spausedd.spec
new file mode 100644
index 0000000..1effaf8
--- /dev/null
+++ b/spausedd.spec
@@ -0,0 +1,96 @@
+%bcond_without vmguestlib
+
+Name: spausedd
+Summary: Utility to detect and log scheduler pause
+Version: 20190320
+Release: 1%{?dist}
+License: ISC
+URL: https://github.com/jfriesse/spausedd
+Source0: https://github.com/jfriesse/%{name}/releases/download/%{version}/%{name}-...
+
+# VMGuestLib exists only for x86 architectures
+%if %{with vmguestlib}
+%ifarch %{ix86} x86_64
+%global use_vmguestlib 1
+%endif
+%endif
+
+BuildRequires: gcc
+%{?systemd_requires}
+BuildRequires: systemd
+
+%if %{defined use_vmguestlib}
+BuildRequires: pkgconfig(vmguestlib)
+%endif
+
+%description
+Utility to detect and log scheduler pause
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%set_build_flags
+make \
+%if %{defined use_vmguestlib}
+ WITH_VMGUESTLIB=1 \
+%else
+ WITH_VMGUESTLIB=0 \
+%endif
+ %{?_smp_mflags}
+
+%install
+make DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install
+
+mkdir -p %{buildroot}/%{_unitdir}
+install -m 755 -p init/%{name}.service %{buildroot}/%{_unitdir}
+
+%clean
+
+%files
+%doc AUTHORS
+%license COPYING
+%{_bindir}/%{name}
+%{_mandir}/man8/*
+%{_unitdir}/spausedd.service
+
+%post
+%systemd_post spausedd.service
+
+%preun
+%systemd_preun spausedd.service
+
+%postun
+%systemd_postun spausedd.service
+
+%changelog
+* Wed Mar 20 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190320-1
+- Use license macro in spec file
+
+* Tue Mar 19 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190319-1
+- Add AUTHORS and COPYING
+- Fix version number in specfile
+- Use install -p to preserve timestamps
+- Use set_build_flags macro
+- Rebase to new version
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-2
+- Initial version for Fedora
+
+* Mon Mar 18 2019 Jan Friesse <jfriesse(a)redhat.com> - 20190318-1
+- Require VMGuestLib only on x86 and x86_64
+
+* Wed Mar 21 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180321-1
+- Remove exlusivearch for VMGuestLib.
+- Add copr branch with enhanced spec file which tries to automatically
+ detect what build options should be used (systemd/vmguestlib).
+
+* Tue Mar 20 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180320-1
+- Add support for VMGuestLib
+- Add more examples
+
+* Mon Feb 19 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180219-1
+- Add support for steal time
+
+* Fri Feb 9 2018 Jan Friesse <jfriesse(a)redhat.com> - 20180209-1
+- Initial version
5 years, 2 months
Architecture specific change in rpms/gcc.git
by githook-noreply@fedoraproject.org
The package rpms/gcc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/gcc.git/commit/?id=4d0e7484170694....
Change:
+%ifarch x86_64 ppc64 ppc64p7
Thanks.
Full change:
============
commit 5c040740528feb6f13e175e25ec8fdf1e449b596
Author: Jakub Jelinek <jakub(a)redhat.com>
Date: Wed Mar 20 13:45:09 2019 +0100
9.0.1-0.11
diff --git a/.gitignore b/.gitignore
index 159ca68..8d0fe1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@
/gcc-9.0.1-20190227.tar.xz
/gcc-9.0.1-20190309.tar.xz
/gcc-9.0.1-20190312.tar.xz
+/gcc-9.0.1-20190320.tar.xz
diff --git a/gcc.spec b/gcc.spec
index 7d49003..2c4fbf8 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,10 +1,10 @@
-%global DATE 20190312
-%global SVNREV 269606
+%global DATE 20190320
+%global SVNREV 269820
%global gcc_version 9.0.1
%global gcc_major 9
# Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 0.10
+%global gcc_release 0.11
%global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f
%global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24
%global _unpackaged_files_terminate_build 0
@@ -255,8 +255,6 @@ Patch9: gcc9-Wno-format-security.patch
Patch10: gcc9-rh1574936.patch
Patch11: gcc9-d-shared-libphobos.patch
Patch12: gcc9-pr89093.patch
-Patch13: gcc9-pr89652.patch
-Patch14: gcc9-pr89660.patch
Patch1000: nvptx-tools-no-ptxas.patch
Patch1001: nvptx-tools-build.patch
@@ -768,8 +766,6 @@ to NVidia PTX capable devices if available.
%endif
%patch11 -p0 -b .d-shared-libphobos~
%patch12 -p0 -b .pr89093~
-%patch13 -p0 -b .pr89652~
-%patch14 -p0 -b .pr89660~
cd nvptx-tools-%{nvptx_tools_gitrev}
%patch1000 -p1 -b .nvptx-tools-no-ptxas~
@@ -2961,7 +2957,28 @@ end
%endif
%changelog
-% Thu Mar 14 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.11
+* Wed Mar 20 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.11
+- update from trunk
+ - PRs c++/63508, c++/85014, c++/85558, c++/88534, c++/88537, c++/88979,
+ c++/89512, c++/89571, c++/89630, c++/89640, c++/89660, c++/89682,
+ c++/89686, c++/89709, c++/89761, c/89734, d/87866, d/88957,
+ debug/88389, debug/89498, debug/89704, fortran/60091, fortran/66695,
+ fortran/68009, fortran/77746, fortran/79485, fortran/84394,
+ fortran/87045, fortran/87673, fortran/88008, fortran/89363,
+ fortran/89364, fortran/89601, fortran/89724, ipa/89684,
+ libstdc++/89461, lto/87809, lto/89335, middle-end/86979,
+ middle-end/88588, middle-end/88945, middle-end/89677,
+ middle-end/89698, middle-end/89737, other/89712,
+ rtl-optimization/89679, rtl-optimization/89721,
+ rtl-optimization/89753, rtl-optimization/89768, sanitizer/80953,
+ target/52726, target/85860, target/87532, target/87561, target/89378,
+ target/89411, target/89523, target/89627, target/89650, target/89711,
+ target/89719, target/89726, target/89736, target/89746, target/89752,
+ testsuite/83453, testsuite/84174, testsuite/89393, testsuite/89471,
+ testsuite/89666, tree-optimization/89546, tree-optimization/89644,
+ tree-optimization/89662, tree-optimization/89688,
+ tree-optimization/89703, tree-optimization/89710,
+ tree-optimization/89720
- turn libgcc_s.so into a linker script on i?86, x86_64, ppc64le and also on
ppc and ppc64 for 64-bit multilib (#1688766)
diff --git a/gcc9-pr89652.patch b/gcc9-pr89652.patch
deleted file mode 100644
index 8fde67d..0000000
--- a/gcc9-pr89652.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-2019-03-12 Jakub Jelinek <jakub(a)redhat.com>
-
- PR c++/89652
- * constexpr.c (cxx_eval_loop_expr): Only remove SAVE_EXPRs that are
- still in new_ctx.values hash_map.
-
- * g++.dg/cpp1y/constexpr-89652.C: New test.
-
---- gcc/cp/constexpr.c.jj 2019-03-08 08:43:23.529496048 +0100
-+++ gcc/cp/constexpr.c 2019-03-11 15:11:32.081334270 +0100
-@@ -4236,7 +4236,8 @@ cxx_eval_loop_expr (const constexpr_ctx
- /* Forget saved values of SAVE_EXPRs. */
- for (hash_set<tree>::iterator iter = save_exprs.begin();
- iter != save_exprs.end(); ++iter)
-- new_ctx.values->remove (*iter);
-+ if (new_ctx.values->get (*iter))
-+ new_ctx.values->remove (*iter);
-
- if (++count >= constexpr_loop_limit)
- {
-@@ -4258,7 +4259,8 @@ cxx_eval_loop_expr (const constexpr_ctx
- /* Forget saved values of SAVE_EXPRs. */
- for (hash_set<tree>::iterator iter = save_exprs.begin();
- iter != save_exprs.end(); ++iter)
-- new_ctx.values->remove (*iter);
-+ if (new_ctx.values->get (*iter))
-+ new_ctx.values->remove (*iter);
-
- return NULL_TREE;
- }
---- gcc/testsuite/g++.dg/cpp1y/constexpr-89652.C.jj 2019-03-11 15:14:21.877561575 +0100
-+++ gcc/testsuite/g++.dg/cpp1y/constexpr-89652.C 2019-03-11 15:16:11.962763933 +0100
-@@ -0,0 +1,36 @@
-+// PR c++/89652
-+// { dg-do compile { target c++14 } }
-+// { dg-options "" }
-+
-+template <typename T> constexpr auto foo (T &e) { return e.foo (); }
-+template <typename T> constexpr auto bar (T &e) { return foo (e); }
-+template <typename T, int N> struct A { typedef T a[N]; };
-+template <typename T, unsigned long N> struct B {
-+ typedef T *b;
-+ typename A<T, N>::a d;
-+ constexpr b foo () { return d; }
-+};
-+template <typename> struct C { long m; };
-+struct D { long n; };
-+template <typename, unsigned long> struct E {
-+ B<C<int>, 1>::b p;
-+ constexpr D operator* () { return {p->m}; }
-+ constexpr E operator++ (int) { auto a{*this}; ++p; return a; }
-+};
-+template <typename T, unsigned long N>
-+constexpr bool operator!= (E<T, N> a, E<T, N>) { return a.p; }
-+template <unsigned long N, typename T, unsigned long M>
-+constexpr auto baz (B<T, M> s, B<D, N>)
-+{
-+ B<D, M> t{};
-+ auto q{foo (t)};
-+ using u = E<T, M>;
-+ auto v = u{bar (s)};
-+ auto w = u{};
-+ while (v != w)
-+ *q++ = *v++;
-+ return t;
-+}
-+constexpr auto a = B<C<int>, 5>{};
-+auto b = B<D, 0>{};
-+auto c = baz (a, b);
diff --git a/gcc9-pr89660.patch b/gcc9-pr89660.patch
deleted file mode 100644
index 49234ab..0000000
--- a/gcc9-pr89660.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-2019-03-12 Jakub Jelinek <jakub(a)redhat.com>
-
- PR c++/89660
- Revert:
- 2019-03-06 Marek Polacek <polacek(a)redhat.com>
-
- PR c++/87378 - bogus -Wredundant-move warning.
- * typeck.c (maybe_warn_pessimizing_move): See if the maybe-rvalue
- overload resolution would actually succeed.
-
- * g++.dg/cpp0x/Wredundant-move1.C (fn4): Drop dg-warning.
-
---- gcc/cp/typeck.c (revision 269427)
-+++ gcc/cp/typeck.c (revision 269426)
-@@ -9429,24 +9429,10 @@ maybe_warn_pessimizing_move (tree retval
- do maybe-rvalue overload resolution even without std::move. */
- else if (treat_lvalue_as_rvalue_p (arg, /*parm_ok*/true))
- {
-- /* Make sure that the overload resolution would actually succeed
-- if we removed the std::move call. */
-- tree t = convert_for_initialization (NULL_TREE, functype,
-- move (arg),
-- (LOOKUP_NORMAL
-- | LOOKUP_ONLYCONVERTING
-- | LOOKUP_PREFER_RVALUE),
-- ICR_RETURN, NULL_TREE, 0,
-- tf_none);
-- /* If this worked, implicit rvalue would work, so the call to
-- std::move is redundant. */
-- if (t != error_mark_node)
-- {
-- auto_diagnostic_group d;
-- if (warning_at (loc, OPT_Wredundant_move,
-- "redundant move in return statement"))
-- inform (loc, "remove %<std::move%> call");
-- }
-+ auto_diagnostic_group d;
-+ if (warning_at (loc, OPT_Wredundant_move,
-+ "redundant move in return statement"))
-+ inform (loc, "remove %<std::move%> call");
- }
- }
- }
---- gcc/testsuite/g++.dg/cpp0x/Wredundant-move1.C (revision 269427)
-+++ gcc/testsuite/g++.dg/cpp0x/Wredundant-move1.C (revision 269426)
-@@ -59,8 +59,7 @@ T
- fn4 (const T t)
- {
- // t is const: will decay into copy despite std::move, so it's redundant.
-- // We used to warn about this, but no longer since c++/87378.
-- return std::move (t);
-+ return std::move (t); // { dg-warning "redundant move in return statement" }
- }
-
- int
diff --git a/sources b/sources
index 57b494e..298fab6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gcc-9.0.1-20190312.tar.xz) = 23ef500528212ea4542398d6909548e6dc5e12a7e58c750895ce85ff5a24e6ed637fcb361a8c248b79e0c93ecbfb72606d07c004a02b891f2078c12e973f51f1
+SHA512 (gcc-9.0.1-20190320.tar.xz) = 20ca885e0afca0470142113271d47eed2876dd778c308f72c9fea86b58a69ab798a8b3b398f240b49a41907adb47446ba087171b75f079597bad3d4348436e18
SHA512 (nvptx-newlib-aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24.tar.xz) = 94f7089365296f7dfa485107b4143bebc850a81586f3460fd896bbbb6ba099a00217d4042133424fd2183b352132f4fd367e6a60599bdae2a26dfd48a77d0e04
SHA512 (nvptx-tools-c28050f60193b3b95a18866a96f03334e874e78f.tar.xz) = a688cb12cf805950a5abbb13b52f45c81dbee98e310b7ed57ae20e76dbfa5964a16270148374a6426d177db71909d28360490f091c86a5d19d4faa5127beeee1
commit 4d0e748417069443292cecced8e96de38a097333
Author: Jakub Jelinek <jakub(a)redhat.com>
Date: Thu Mar 14 13:17:36 2019 +0100
Resolves: #1688766
diff --git a/gcc.spec b/gcc.spec
index 874faad..7d49003 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1266,36 +1266,39 @@ mkdir -p %{buildroot}/%{_lib}
mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1
chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_major}-%{DATE}.so.1
ln -sf libgcc_s-%{gcc_major}-%{DATE}.so.1 %{buildroot}/%{_lib}/libgcc_s.so.1
-ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
-%ifarch sparcv9 ppc
-ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so
-%endif
-%ifarch %{multilib_64_archs}
-ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
-%endif
-%ifarch ppc
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 ppc64le %{arm}
rm -f $FULLPATH/libgcc_s.so
echo '/* GNU ld script
Use the shared library, but some functions are only in
the static library, so try that secondarily. */
-OUTPUT_FORMAT(elf32-powerpc)
-GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
+OUTPUT_FORMAT('`gcc -Wl,--print-output-format -nostdlib -r -o /dev/null`')
+GROUP ( /%{_lib}/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
+%else
+ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
%endif
-%ifarch ppc64 ppc64p7
-rm -f $FULLPATH/32/libgcc_s.so
+%ifarch sparcv9 ppc
+%ifarch ppc
+rm -f $FULLPATH/64/libgcc_s.so
echo '/* GNU ld script
Use the shared library, but some functions are only in
the static library, so try that secondarily. */
-OUTPUT_FORMAT(elf32-powerpc)
-GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so
+OUTPUT_FORMAT('`gcc -m64 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
+GROUP ( /lib64/libgcc_s.so.1 libgcc.a )' > $FULLPATH/64/libgcc_s.so
+%else
+ln -sf /lib64/libgcc_s.so.1 $FULLPATH/64/libgcc_s.so
%endif
-%ifarch %{arm}
-rm -f $FULLPATH/libgcc_s.so
+%endif
+%ifarch %{multilib_64_archs}
+%ifarch x86_64 ppc64 ppc64p7
+rm -f $FULLPATH/64/libgcc_s.so
echo '/* GNU ld script
Use the shared library, but some functions are only in
the static library, so try that secondarily. */
-OUTPUT_FORMAT(elf32-littlearm)
-GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
+OUTPUT_FORMAT('`gcc -m32 -Wl,--print-output-format -nostdlib -r -o /dev/null`')
+GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/32/libgcc_s.so
+%else
+ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
+%endif
%endif
mv -f %{buildroot}%{_prefix}/%{_lib}/libgomp.spec $FULLPATH/
@@ -2958,6 +2961,10 @@ end
%endif
%changelog
+% Thu Mar 14 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.11
+- turn libgcc_s.so into a linker script on i?86, x86_64, ppc64le and also on
+ ppc and ppc64 for 64-bit multilib (#1688766)
+
* Tue Mar 12 2019 Jakub Jelinek <jakub(a)redhat.com> 9.0.1-0.10
- update from trunk
- PRs bootstrap/89656, c++/70349, c++/86521, c++/87571, c++/87750,
5 years, 2 months
Architecture specific change in rpms/nspr.git
by githook-noreply@fedoraproject.org
The package rpms/nspr.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/nspr.git/commit/?id=61be66d1e3283....
Change:
+%ifarch i686 x86_64
Thanks.
Full change:
============
commit 61be66d1e328383f72c9392738a0bc8b68cf1a45
Author: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Wed Mar 13 17:24:33 2019 +0100
prefer gcc atomics on i686 and x86_64, to ensure gnu.property notes are there
Patch originally by Daiki Ueno.
diff --git a/nspr-gcc-atomics.patch b/nspr-gcc-atomics.patch
new file mode 100644
index 0000000..b94e840
--- /dev/null
+++ b/nspr-gcc-atomics.patch
@@ -0,0 +1,77 @@
+diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
+--- a/pr/include/md/_linux.h
++++ b/pr/include/md/_linux.h
+@@ -82,53 +82,73 @@
+ #define NO_DLOPEN_NULL
+ #endif
+
+ #if defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #define _PR_HAVE_SOCKADDR_LEN
+ #endif
+
+ #if defined(__i386__)
++#if defined(__GNUC__)
++/* Use GCC built-in functions */
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
++#else
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT _PR_x86_AtomicIncrement
+ extern PRInt32 _PR_x86_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_x86_AtomicDecrement
+ extern PRInt32 _PR_x86_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_x86_AtomicAdd
+ extern PRInt32 _PR_x86_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET _PR_x86_AtomicSet
+ #endif
++#endif
+
+ #if defined(__ia64__)
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_ia64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT _PR_ia64_AtomicIncrement
+ extern PRInt32 _PR_ia64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_ia64_AtomicDecrement
+ extern PRInt32 _PR_ia64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_ia64_AtomicAdd
+ extern PRInt32 _PR_ia64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET _PR_ia64_AtomicSet
+ #endif
+
+ #if defined(__x86_64__)
++#if defined(__GNUC__)
++/* Use GCC built-in functions */
++#define _PR_HAVE_ATOMIC_OPS
++#define _MD_INIT_ATOMIC()
++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
++#else
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ extern PRInt32 _PR_x86_64_AtomicIncrement(PRInt32 *val);
+ #define _MD_ATOMIC_INCREMENT _PR_x86_64_AtomicIncrement
+ extern PRInt32 _PR_x86_64_AtomicDecrement(PRInt32 *val);
+ #define _MD_ATOMIC_DECREMENT _PR_x86_64_AtomicDecrement
+ extern PRInt32 _PR_x86_64_AtomicAdd(PRInt32 *ptr, PRInt32 val);
+ #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd
+ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
+ #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
+ #endif
++#endif
+
+ #if defined(__or1k__)
+ #if defined(__GNUC__)
+ /* Use GCC built-in functions */
+ #define _PR_HAVE_ATOMIC_OPS
+ #define _MD_INIT_ATOMIC()
+ #define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
+ #define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
diff --git a/nspr.spec b/nspr.spec
index 7eae55e..350d1ec 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -11,7 +11,7 @@ rpm.define(string.format("nspr_archive_version %s",
Summary: Netscape Portable Runtime
Name: nspr
Version: %{nspr_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/nspr/
Conflicts: filesystem < 3
@@ -24,6 +24,7 @@ Source0: %{name}-%{nspr_archive_version}.tar.gz
Source1: nspr-config.xml
Patch1: nspr-config-pc.patch
+Patch2: nspr-gcc-atomics.patch
%description
NSPR provides platform independence for non-GUI operating system
@@ -54,6 +55,9 @@ Header files for doing development with the Netscape Portable Runtime.
cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
%patch1 -p0 -b .flags
+pushd nspr
+%patch2 -p1 -b .gcc-atomics
+popd
%build
%define _configure ./nspr/configure
@@ -72,6 +76,10 @@ cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
--enable-optimize="$RPM_OPT_FLAGS" \
--disable-debug
+# The assembly files are only for legacy atomics, to which we prefer GCC atomics
+%ifarch i686 x86_64
+sed -i '/^PR_MD_ASFILES/d' config/autoconf.mk
+%endif
make
date +"%e %B %Y" | tr -d '\n' > date.xml
@@ -140,6 +148,9 @@ done
%{_mandir}/man*/*
%changelog
+* Wed Mar 13 2019 Paolo Bonzini <pbonzini(a)redhat.com> - 4.20.0-3
+- Prefer GCC atomics on i686 and x86_64
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 4.20.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=9718c30...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=84a9b91...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=57ad88d....
Change:
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+ExclusiveArch: %{ix86} x86_64 noarch
+ExclusiveArch: noarch x86_64
Thanks.
Full change:
============
commit 341f4a732627f1cfa9aeddf1725aa69592bacb41
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 15:17:09 2018 +0800
Minor update to changelog
diff --git a/ursa-major.spec b/ursa-major.spec
index 76de2b8..edd8857 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -180,7 +180,7 @@ py.test
%changelog
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
-- build can be scheduled to i386 arch, include %{ix86}
+- build can be scheduled to i386 arch, include ix86
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
commit 84a9b916805750b13579f4c885717e4d044f2f8b
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:51:09 2018 +0800
Include %{ix86} arch
We have 'ExclusiveArch: x86_64 noarch', but job can still be
scheduled to i386 arch, include ix86 to workaround.
diff --git a/ursa-major.spec b/ursa-major.spec
index c5dd470..76de2b8 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,9 +15,10 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# 1. libmodulemd is not available for ppc or i686
-# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
-ExclusiveArch: noarch x86_64
+# EPEL: libmodulemd is not available for ppc or i686
+# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is
+# error: Architecture is not included: i386
+ExclusiveArch: %{ix86} x86_64 noarch
BuildRequires: help2man
@@ -178,8 +179,11 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
+- build can be scheduled to i386 arch, include %{ix86}
+
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
-- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 57ad88d4da72464b73281401fbdbddecd9c3a084
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:09:15 2018 +0800
Limit to x86_64 build
Seeing libmodulemd is missing from ppc64le buildroot, just enable
x86_64 build.
diff --git a/ursa-major.spec b/ursa-major.spec
index fbc578d..c5dd470 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,8 +15,9 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# libmodulemd is not available for ppc or i686
-ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+# 1. libmodulemd is not available for ppc or i686
+# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+ExclusiveArch: noarch x86_64
BuildRequires: help2man
@@ -177,6 +178,9 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
+- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 9718c30dbb01433984f3478800161653473cd619
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 13:38:49 2018 +0800
Initial import
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b3ec1d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/ursa-major-0.1.1.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..f552a64
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (ursa-major-0.1.1.tar.gz) = 6515eab4a9b3bdf0acb055a36bb2b76f4387cef9c4aff3f75c87555d7afa2897feb4feba1d26a588db26a1321fb473a570c876991890489a91d96f579c8ba3c2
diff --git a/ursa-major.spec b/ursa-major.spec
new file mode 100644
index 0000000..fbc578d
--- /dev/null
+++ b/ursa-major.spec
@@ -0,0 +1,184 @@
+%if 0%{?fedora}
+# we have some koji hubs doesn't support Python3 with kerberos auth
+# at this moment, so we build with Python2 for all platforms now
+%global with_python3 0
+%endif
+
+Name: ursa-major
+Version: 0.1.1
+Release: 2%{?dist}
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+
+Group: Development/Tools
+License: MIT
+URL: https://pagure.io/ursa-major
+Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
+
+BuildArch: noarch
+# libmodulemd is not available for ppc or i686
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+
+
+BuildRequires: help2man
+BuildRequires: libmodulemd
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-gobject-base
+BuildRequires: python3-cairo
+BuildRequires: python3-koji
+BuildRequires: python3-six
+BuildRequires: python3-requests
+BuildRequires: python3-jinja2
+BuildRequires: python3-psutil
+BuildRequires: python3-pytest
+BuildRequires: python3-mock
+%else
+BuildRequires: python2-devel
+BuildRequires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-setuptools
+BuildRequires: python-gobject-base
+BuildRequires: pycairo
+BuildRequires: python-six
+BuildRequires: python-requests
+BuildRequires: python-jinja2
+BuildRequires: python-futures
+BuildRequires: pytest
+BuildRequires: python-mock
+%else
+BuildRequires: python2-setuptools
+BuildRequires: python2-gobject-base
+BuildRequires: python2-cairo
+BuildRequires: python2-six
+BuildRequires: python2-requests
+BuildRequires: python2-jinja2
+BuildRequires: python2-futures
+BuildRequires: python2-pytest
+BuildRequires: python2-mock
+%endif
+%endif
+
+Requires: gobject-introspection
+Requires: krb5-workstation
+Requires: koji
+Requires: libmodulemd
+Requires: m2crypto
+
+%if 0%{?with_python3}
+Requires: python3-gobject-base
+Requires: python3-cairo
+Requires: python3-koji
+Requires: python3-six
+Requires: python3-requests
+Requires: python3-jinja2
+%else
+Requires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires: python-gobject-base
+Requires: pycairo
+Requires: python-six
+Requires: python-requests
+Requires: python-jinja2
+Requires: python-futures
+%else
+Requires: python2-gobject-base
+Requires: python2-cairo
+Requires: python2-six
+Requires: python2-requests
+Requires: python2-jinja2
+Requires: python2-futures
+%endif
+%endif
+
+
+%description
+Usra-Major can be used to edit a tag config file and update module's koji tags
+in koji's tag inheritance accordingly per the configuration in tag config file.
+
+
+%package -n ursa-major-stage
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+Requires: %{name} = %{version}-%{release}
+
+%description -n ursa-major-stage
+The ursa-major-stage package contains script and configurations for Ursa-Major
+to talk with Fedora's stage instances (Koji, MBS).
+
+
+%prep
+%setup -q
+
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# workaround for no egg-info
+sed -i '/pycairo/d' requirements.txt
+# old setuptools not support environment marker
+sed -i 's/futures.*/futures/' requirements.txt
+%endif
+
+# workaround for no egg-info
+sed -i '/koji/d' requirements.txt
+
+%build
+%if 0%{?with_python3}
+%py3_build
+%else
+%py2_build
+%endif
+
+
+%install
+%if 0%{?with_python3}
+%py3_install
+%else
+%py2_install
+%endif
+
+%if 0%{?with_python3}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%else
+export PYTHONPATH=%{buildroot}%{python2_sitelib}
+%endif
+mkdir -p %{buildroot}/%{_mandir}/man1
+
+help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
+for cmd in show-config check-config remove-module add-module add-tag; do
+ help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
+done
+
+
+%check
+%if 0%{?with_python3}
+py.test-3
+%else
+py.test
+%endif
+
+
+%files
+%doc README.rst
+%license LICENSE
+
+%if 0%{?with_python3}
+%{python3_sitelib}/ursa_major*
+%else
+%{python2_sitelib}/ursa_major*
+%endif
+
+%{_bindir}/ursa-major
+%dir %{_sysconfdir}/ursa-major
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major.conf
+%doc %{_mandir}/man1/ursa-major*.1*
+
+%files stage
+%{_bindir}/ursa-major-stage
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major-stage.conf
+
+
+%changelog
+* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
+- Limit build arches as libmodulemd is not available for ppc or i686
+
+* Fri Oct 26 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-1
+- Initial version of spec file
5 years, 2 months
Architecture specific change in rpms/ursa-major.git
by githook-noreply@fedoraproject.org
The package rpms/ursa-major.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=9718c30...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=84a9b91...
https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=57ad88d....
Change:
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+ExclusiveArch: %{ix86} x86_64 noarch
+ExclusiveArch: noarch x86_64
Thanks.
Full change:
============
commit 341f4a732627f1cfa9aeddf1725aa69592bacb41
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 15:17:09 2018 +0800
Minor update to changelog
diff --git a/ursa-major.spec b/ursa-major.spec
index 76de2b8..edd8857 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -180,7 +180,7 @@ py.test
%changelog
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
-- build can be scheduled to i386 arch, include %{ix86}
+- build can be scheduled to i386 arch, include ix86
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
commit 84a9b916805750b13579f4c885717e4d044f2f8b
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:51:09 2018 +0800
Include %{ix86} arch
We have 'ExclusiveArch: x86_64 noarch', but job can still be
scheduled to i386 arch, include ix86 to workaround.
diff --git a/ursa-major.spec b/ursa-major.spec
index c5dd470..76de2b8 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,9 +15,10 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# 1. libmodulemd is not available for ppc or i686
-# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
-ExclusiveArch: noarch x86_64
+# EPEL: libmodulemd is not available for ppc or i686
+# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is
+# error: Architecture is not included: i386
+ExclusiveArch: %{ix86} x86_64 noarch
BuildRequires: help2man
@@ -178,8 +179,11 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-4
+- build can be scheduled to i386 arch, include %{ix86}
+
* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
-- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 57ad88d4da72464b73281401fbdbddecd9c3a084
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 14:09:15 2018 +0800
Limit to x86_64 build
Seeing libmodulemd is missing from ppc64le buildroot, just enable
x86_64 build.
diff --git a/ursa-major.spec b/ursa-major.spec
index fbc578d..c5dd470 100644
--- a/ursa-major.spec
+++ b/ursa-major.spec
@@ -6,7 +6,7 @@
Name: ursa-major
Version: 0.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools
@@ -15,8 +15,9 @@ URL: https://pagure.io/ursa-major
Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
BuildArch: noarch
-# libmodulemd is not available for ppc or i686
-ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+# 1. libmodulemd is not available for ppc or i686
+# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+ExclusiveArch: noarch x86_64
BuildRequires: help2man
@@ -177,6 +178,9 @@ py.test
%changelog
+* Mon Dec 03 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-3
+- libmodulemd is missing from ppc64le buildroot, enable x86_64 only
+
* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
- Limit build arches as libmodulemd is not available for ppc or i686
commit 9718c30dbb01433984f3478800161653473cd619
Author: Qixiang Wan <qwan(a)redhat.com>
Date: Mon Dec 3 13:38:49 2018 +0800
Initial import
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b3ec1d3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/ursa-major-0.1.1.tar.gz
diff --git a/sources b/sources
new file mode 100644
index 0000000..f552a64
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (ursa-major-0.1.1.tar.gz) = 6515eab4a9b3bdf0acb055a36bb2b76f4387cef9c4aff3f75c87555d7afa2897feb4feba1d26a588db26a1321fb473a570c876991890489a91d96f579c8ba3c2
diff --git a/ursa-major.spec b/ursa-major.spec
new file mode 100644
index 0000000..fbc578d
--- /dev/null
+++ b/ursa-major.spec
@@ -0,0 +1,184 @@
+%if 0%{?fedora}
+# we have some koji hubs doesn't support Python3 with kerberos auth
+# at this moment, so we build with Python2 for all platforms now
+%global with_python3 0
+%endif
+
+Name: ursa-major
+Version: 0.1.1
+Release: 2%{?dist}
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+
+Group: Development/Tools
+License: MIT
+URL: https://pagure.io/ursa-major
+Source0: https://files.pythonhosted.org/packages/source/u/%{name}/%{name}-%{versio...
+
+BuildArch: noarch
+# libmodulemd is not available for ppc or i686
+ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
+
+
+BuildRequires: help2man
+BuildRequires: libmodulemd
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-gobject-base
+BuildRequires: python3-cairo
+BuildRequires: python3-koji
+BuildRequires: python3-six
+BuildRequires: python3-requests
+BuildRequires: python3-jinja2
+BuildRequires: python3-psutil
+BuildRequires: python3-pytest
+BuildRequires: python3-mock
+%else
+BuildRequires: python2-devel
+BuildRequires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+BuildRequires: python-setuptools
+BuildRequires: python-gobject-base
+BuildRequires: pycairo
+BuildRequires: python-six
+BuildRequires: python-requests
+BuildRequires: python-jinja2
+BuildRequires: python-futures
+BuildRequires: pytest
+BuildRequires: python-mock
+%else
+BuildRequires: python2-setuptools
+BuildRequires: python2-gobject-base
+BuildRequires: python2-cairo
+BuildRequires: python2-six
+BuildRequires: python2-requests
+BuildRequires: python2-jinja2
+BuildRequires: python2-futures
+BuildRequires: python2-pytest
+BuildRequires: python2-mock
+%endif
+%endif
+
+Requires: gobject-introspection
+Requires: krb5-workstation
+Requires: koji
+Requires: libmodulemd
+Requires: m2crypto
+
+%if 0%{?with_python3}
+Requires: python3-gobject-base
+Requires: python3-cairo
+Requires: python3-koji
+Requires: python3-six
+Requires: python3-requests
+Requires: python3-jinja2
+%else
+Requires: python2-koji
+%if 0%{?rhel} && 0%{?rhel} <= 7
+Requires: python-gobject-base
+Requires: pycairo
+Requires: python-six
+Requires: python-requests
+Requires: python-jinja2
+Requires: python-futures
+%else
+Requires: python2-gobject-base
+Requires: python2-cairo
+Requires: python2-six
+Requires: python2-requests
+Requires: python2-jinja2
+Requires: python2-futures
+%endif
+%endif
+
+
+%description
+Usra-Major can be used to edit a tag config file and update module's koji tags
+in koji's tag inheritance accordingly per the configuration in tag config file.
+
+
+%package -n ursa-major-stage
+Summary: A utility for working with module's koji tags in koji's tag inheritance
+Requires: %{name} = %{version}-%{release}
+
+%description -n ursa-major-stage
+The ursa-major-stage package contains script and configurations for Ursa-Major
+to talk with Fedora's stage instances (Koji, MBS).
+
+
+%prep
+%setup -q
+
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# workaround for no egg-info
+sed -i '/pycairo/d' requirements.txt
+# old setuptools not support environment marker
+sed -i 's/futures.*/futures/' requirements.txt
+%endif
+
+# workaround for no egg-info
+sed -i '/koji/d' requirements.txt
+
+%build
+%if 0%{?with_python3}
+%py3_build
+%else
+%py2_build
+%endif
+
+
+%install
+%if 0%{?with_python3}
+%py3_install
+%else
+%py2_install
+%endif
+
+%if 0%{?with_python3}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
+%else
+export PYTHONPATH=%{buildroot}%{python2_sitelib}
+%endif
+mkdir -p %{buildroot}/%{_mandir}/man1
+
+help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1
+for cmd in show-config check-config remove-module add-module add-tag; do
+ help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1
+done
+
+
+%check
+%if 0%{?with_python3}
+py.test-3
+%else
+py.test
+%endif
+
+
+%files
+%doc README.rst
+%license LICENSE
+
+%if 0%{?with_python3}
+%{python3_sitelib}/ursa_major*
+%else
+%{python2_sitelib}/ursa_major*
+%endif
+
+%{_bindir}/ursa-major
+%dir %{_sysconfdir}/ursa-major
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major.conf
+%doc %{_mandir}/man1/ursa-major*.1*
+
+%files stage
+%{_bindir}/ursa-major-stage
+%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major-stage.conf
+
+
+%changelog
+* Fri Nov 16 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-2
+- Limit build arches as libmodulemd is not available for ppc or i686
+
+* Fri Oct 26 2018 Qixiang Wan <qwan(a)redhat.com> - 0.1.1-1
+- Initial version of spec file
5 years, 2 months
Architecture specific change in rpms/neovim.git
by githook-noreply@fedoraproject.org
The package rpms/neovim.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/neovim.git/commit/?id=fd84b96a4d1....
Change:
+%ifarch %{arm} %{ix86} x86_64 %{mips}
Thanks.
Full change:
============
commit fd84b96a4d104755d0d6beea74c74c011aa75da0
Author: Andreas Schneider <asn(a)cryptomilk.org>
Date: Tue Mar 19 12:13:04 2019 +0100
luajit is not available on all platform and fails to build on aarch64
diff --git a/neovim.spec b/neovim.spec
index 4c8142e..18ec100 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,5 +1,9 @@
%bcond_with jemalloc
+%ifarch %{arm} %{ix86} x86_64 %{mips}
%bcond_without luajit
+%else
+%bcond_with luajit
+%endif
Name: neovim
Version: 0.3.4
@@ -12,9 +16,7 @@ Url: http://neovim.io
Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.t...
Source1: sysinit.vim
Source2: spec-template
-%if ! %{with luajit}
Patch0: neovim-0.1.7-bitop.patch
-%endif
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -63,7 +65,11 @@ excisions, Neovim is Vim. It is built for users who want the good
parts of Vim, without compromise, and more.
%prep
-%autosetup -p1
+%setup -q
+
+%if %{without luajit}
+%patch0 -p1 -b .bitop
+%endif
%build
mkdir -p build
commit 863e8f3d648ec336e0c69f5263b80790aa791afa
Author: Andreas Schneider <asn(a)cryptomilk.org>
Date: Tue Mar 19 12:02:58 2019 +0100
Add sources for neovim-0.3.4
diff --git a/.gitignore b/.gitignore
index c78147b..3bee068 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/neovim-0.3.1.tar.gz
/neovim-0.3.2.tar.gz
/neovim-0.3.3.tar.gz
+/neovim-0.3.4.tar.gz
diff --git a/sources b/sources
index 3780505..994b168 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neovim-0.3.3.tar.gz) = 2e2910e0dafdff69d2d9f54376c6d7c64e0f172bda02f85281fe6e694e7d81365e682793e454a0ca6f6c1b8a4ed9120bbfe574afa1fd0e6368e06af743d7d147
+SHA512 (neovim-0.3.4.tar.gz) = fbf22ccffbb36c082bfe9a66b3d0180a78581102732a44ab7a5417aef517c88b69406491854613a1cf347ddab6fc6e277f959887556d2c0068cf181e4d88c36b
commit 1ca2a4ce0653a2167003d5968d2d8cfb7f0ec882
Author: Aron Griffis <aron(a)scampersand.com>
Date: Sat Mar 9 08:51:42 2019 -0500
Update to version 0.3.4 with luajit, rhbz #1685781
diff --git a/neovim.spec b/neovim.spec
index db6c515..4c8142e 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -1,8 +1,9 @@
%bcond_with jemalloc
+%bcond_without luajit
Name: neovim
-Version: 0.3.3
-Release: 3%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
License: ASL 2.0
Summary: Vim-fork focused on extensibility and agility
@@ -11,7 +12,9 @@ Url: http://neovim.io
Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.t...
Source1: sysinit.vim
Source2: spec-template
+%if ! %{with luajit}
Patch0: neovim-0.1.7-bitop.patch
+%endif
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -20,9 +23,17 @@ BuildRequires: fdupes
BuildRequires: gettext
BuildRequires: gperf
BuildRequires: gcc
+%if %{with luajit}
+# luajit implements version 5.1 of the lua language spec, so it needs the
+# compat versions of libs.
+BuildRequires: luajit-devel
+BuildRequires: compat-lua-lpeg
+BuildRequires: compat-lua-mpack
+%else
BuildRequires: lua-devel
BuildRequires: lua-lpeg
BuildRequires: lua-mpack
+%endif
%if %{with jemalloc}
BuildRequires: jemalloc-devel
%endif
@@ -58,8 +69,8 @@ parts of Vim, without compromise, and more.
mkdir -p build
pushd build
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DPREFER_LUA=ON \
- -DLUA_PRG=%{_bindir}/lua \
+ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \
+ -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \
-DENABLE_JEMALLOC=%{?with_jemalloc:ON}%{!?with_jemalloc:OFF} \
..
@@ -1531,6 +1542,9 @@ install -m0644 runtime/nvim.png %{buildroot}%{_datadir}/pixmaps/nvim.png
%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
%changelog
+* Wed Mar 06 2019 Aron Griffis <aron(a)scampersand.com> - 0.3.4-1
+- Update to version 0.3.4 with luajit, rhbz #1685781
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.3.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months