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
This commit is contained in:
parent
95470567ce
commit
0259f76ab6
2
sources
2
sources
|
@ -1 +1 @@
|
|||
c15490dc67c83abdb1cda365696c25bb yast2-devtools-3.1.33.tar.gz
|
||||
3ee30a6e57fc457090a36609f67bf229 yast2-devtools-3.1.34.tar.gz
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
%global src_url https://github.com/%{suite_name}/%{repo_name}
|
||||
|
||||
Name: %{suite_name}2-%{name_suffix}
|
||||
Version: 3.1.33
|
||||
Version: 3.1.34
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: YaST Development Tools
|
||||
|
||||
|
@ -60,6 +60,7 @@ BuildRequires: pkgconfig
|
|||
BuildRequires: rubygem(redcarpet)
|
||||
BuildRequires: rubygem(yard)
|
||||
|
||||
Requires: %{_bindir}/desktop-file-validate
|
||||
Requires: %{_bindir}/libtool
|
||||
Requires: %{_bindir}/xsltproc
|
||||
Requires: automake
|
||||
|
@ -91,7 +92,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 -Wobsolete
|
||||
%{_bindir}/autoreconf --force --install -Wall
|
||||
|
||||
# Fix-up hashbangs.
|
||||
for _file in $(%{__grep} -Rle '#![ \t]*/usr/bin/env' .)
|
||||
|
@ -102,6 +103,15 @@ 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
|
||||
|
@ -119,7 +129,7 @@ done
|
|||
%{buildroot}%{?_pkgdocdir}/ChangeLog
|
||||
|
||||
# Install additional tools.
|
||||
%{__cp} -a ./mass-tools/y2m %{buildroot}%{_bindir}
|
||||
%{__install} -pm 0755 ./mass-tools/y2m %{buildroot}%{_bindir}
|
||||
|
||||
# Move documentation to %%{?_pkgdocdir}.
|
||||
%{__mv} -f %{buildroot}%{_docdir}/packages/yast2-devtools/* \
|
||||
|
@ -133,7 +143,7 @@ done
|
|||
%endif # "0%%{?_macrosdir}" != "0%%{_sysconfdir}/rpm"
|
||||
|
||||
# Final clean-up.
|
||||
%{__rm} -rf %{buildroot}%{_docdir}/packages/yast2-devtools \
|
||||
%{__rm} -rf %{buildroot}%{_docdir}/packages \
|
||||
%if %{with license_dir}
|
||||
%{buildroot}%{?_pkgdocdir}/COPYING \
|
||||
%endif # %%{with license_dir}
|
||||
|
@ -167,6 +177,15 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
|
Loading…
Reference in New Issue