besser82 pushed to yast2-devtools (master). "new upstream release (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 13 15:12:30 UTC 2015


From 0259f76ab699d170a954dc7fd8565fe0e5664ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser at gmail.com>
Date: Tue, 12 May 2015 15:12:07 +0200
Subject: 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


diff --git a/sources b/sources
index bbdfb2a..8d84f07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c15490dc67c83abdb1cda365696c25bb  yast2-devtools-3.1.33.tar.gz
+3ee30a6e57fc457090a36609f67bf229  yast2-devtools-3.1.34.tar.gz
diff --git a/yast2-devtools.spec b/yast2-devtools.spec
index 43938c9..fd6c490 100644
--- a/yast2-devtools.spec
+++ b/yast2-devtools.spec
@@ -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 at 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 at gmail.com> - 3.1.33-1
 - new upstream release
 - dropped %%{__chmod} on `gettextdomains`, fixed in upstream's Autotools
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/yast2-devtools.git/commit/?h=master&id=0259f76ab699d170a954dc7fd8565fe0e5664ce8


More information about the scm-commits mailing list