Compare commits

..

No commits in common. "rawhide" and "epel7" have entirely different histories.

2 changed files with 15 additions and 132 deletions

View file

@ -1 +1 @@
f08641290cf165de5fa1243ac44513b1 yast2-devtools-3.1.36.tar.gz
c0f095a1a59d5fc6738f7cf6a7417b8c yast2-devtools-3.1.30.tar.gz

View file

@ -4,7 +4,7 @@
# Conditional for bootstrapping new distributions.
# Uncomment for bootstrap-builds.
#global bootstrap_build 1
%global bootstrap_build 1
# Settings used for build from snapshots.
%{!?rel_build:%global commit a85b2c6a5bf53de97883299a87f61a0bcf6844b7}
@ -36,13 +36,12 @@
%global src_url https://github.com/%{suite_name}/%{repo_name}
Name: %{suite_name}2-%{name_suffix}
Version: 3.1.36
Release: 24%{?gitrel}%{?dist}
Version: 3.1.30
Release: 0.1%{?gitrel}%{?dist}
Summary: YaST Development Tools
# Automatically converted from old format: GPLv2+ - review is highly recommended.
License: GPL-2.0-or-later
URL: https://%{suite_name}.github.io
License: GPLv2+
URL: https://en.opensuse.org/Portal:YaST
# Sources for release-builds.
%{?rel_build:Source0: %{src_url}/archive/%{repo_name}/master/%{version}.tar.gz#/%{gittar}}
# Sources for snapshot-builds.
@ -50,8 +49,6 @@ URL: https://%{suite_name}.github.io
BuildArch: noarch
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: automake
BuildRequires: docbook-style-xsl
BuildRequires: doxygen
@ -59,12 +56,10 @@ BuildRequires: fdupes
BuildRequires: gettext
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: perl-generators
BuildRequires: pkgconfig
BuildRequires: rubygem(redcarpet)
BuildRequires: rubygem(yard)
Requires: %{_bindir}/desktop-file-validate
Requires: %{_bindir}/libtool
Requires: %{_bindir}/xsltproc
Requires: automake
@ -81,7 +76,7 @@ Requires: rubygem(yard)
# Additional requirements after bootstrap.
%if 0%{?bootstrap_build} == 0
BuildRequires: pkgconfig(%{name})
Requires: config(yast2-filesystem)
Requires: yast2-filesystem
%endif # 0%%{?bootstrap_build} == 0
%description
@ -96,7 +91,7 @@ and building YaST2 modules and components.
./build-tools/scripts/y2autoconf --bootstrap ./build-tools/
./build-tools/scripts/y2automake --bootstrap ./build-tools/
%{__cat} ./build-tools/aclocal/*.m4 > acinclude.m4
%{_bindir}/autoreconf --force --install -Wall
%{_bindir}/autoreconf -fiv
# Fix-up hashbangs.
for _file in $(%{__grep} -Rle '#![ \t]*/usr/bin/env' .)
@ -107,15 +102,6 @@ do
%{__mv} -f ${_file}.new ${_file}
done
# Adjust %%yast_docdir for releases with versioned %%_docdir.
%if (0%{?fedora} && 0%{?fedora} < 21) || (0%{?rhel} && 0%{?rhel} < 8)
_file="./build-tools/rpm/macros.yast"
%{__sed} -e 's!^%%yast_docdir.*$!&-%%{version}!' \
< ${_file} > ${_file}.new && \
/bin/touch -r ${_file} ${_file}.new && \
%{__mv} -f ${_file}.new ${_file}
%endif # (0%%{?fedora} && 0%%{?fedora} < 21) || (0%%{?rhel} && 0%%{?rhel} < 8)
%build
%configure
@ -133,7 +119,7 @@ _file="./build-tools/rpm/macros.yast"
%{buildroot}%{?_pkgdocdir}/ChangeLog
# Install additional tools.
%{__install} -pm 0755 ./mass-tools/y2m %{buildroot}%{_bindir}
%{__cp} -a ./mass-tools/y2m %{buildroot}%{_bindir}
# Move documentation to %%{?_pkgdocdir}.
%{__mv} -f %{buildroot}%{_docdir}/packages/yast2-devtools/* \
@ -146,8 +132,12 @@ _file="./build-tools/rpm/macros.yast"
%{__mv} -f %{buildroot}%{_sysconfdir}/rpm/* %{buildroot}%{?_macrosdir}
%endif # "0%%{?_macrosdir}" != "0%%{_sysconfdir}/rpm"
# This script gets sourced by external commands, only.
%{__chmod} -c 0644 \
%{buildroot}%{_datadir}/YaST2/data/devtools/bin/gettextdomains
# Final clean-up.
%{__rm} -rf %{buildroot}%{_docdir}/packages \
%{__rm} -rf %{buildroot}%{_docdir}/packages/yast2-devtools \
%if %{with license_dir}
%{buildroot}%{?_pkgdocdir}/COPYING \
%endif # %%{with license_dir}
@ -158,10 +148,7 @@ _file="./build-tools/rpm/macros.yast"
%check
if [ ! -f "%{yast_ydatadir}/devtools/NO_MAKE_CHECK" ]; then
%{__make} check VERBOSE=1 Y2DIR="%{buildroot}/%{yast_dir}" \
DESTDIR="%{buildroot}"
fi
%{__make} check
%files
@ -181,109 +168,5 @@ fi
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 3.1.36-20
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.1.36-6
- Escape macros in %%changelog
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.36-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.36-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 23 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.36-1
- new upstream release
* Wed May 13 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.34-1
- new upstream release
- added 'Requires: %%{_bindir}/desktop-file-validate', it's a
commonly needed BuildRequires for other YaST-packages
- adjust %%yast_docdir for releases with versioned %%_docdir
- use %%{__install} for adding `y2m` to package
- improved cleaning of empty left-over dirs
- run autoreconf with `-Wall`-flag
* Tue May 12 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.33-1
- new upstream release
- dropped %%{__chmod} on `gettextdomains`, fixed in upstream's Autotools
- dropped verbosity on autoreconf-invocation
- changed %%{url} to new location
* Mon May 11 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.32-1
- new upstream release
- add `-Wobsolete`-flag to autoreconf
- remove Patch0 and Patch1, since they are merged into upstream
- use conditional and more elaborate test-invocation
* Sat May 09 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.31-2
- fix AutoTools: Obsoleted m4s found: AC_PROG_LIBTOOL (#1220036)
- add Patch0: use new `AC_INIT()`-syntax with args in square braces
- add Patch1: replace obsolete `A[CM]_PROG_LIBTOOL` with `LT_INIT()`
* Fri May 08 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.31-1
- new upstream release
* Fri May 08 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.30-1
- initial rpm release (#1218749)
* Mon May 04 2015 Björn Esser <bjoern.esser@gmail.com> - 3.1.30-0.1
- bootstrapping