[packages/wxWidgets] - catch sed errors; fix _configf macro
arekm
arekm at pld-linux.org
Tue Jan 14 23:04:46 CET 2014
commit b35e60d3dc7e4e46ff55e976e23f63ededf6f91c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Jan 14 23:04:43 2014 +0100
- catch sed errors; fix _configf macro
wxWidgets.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index 3826fc5..1d3945d 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,6 +10,7 @@
Summary: wxWidgets library
Summary(pl.UTF-8): Biblioteka wxWidgets
Name: wxWidgets
+%define majver 3.0
Version: 3.0.0
Release: 1
License: wxWindows Library Licence 3.1 (LGPL v2+ with exception)
@@ -580,7 +581,12 @@ done
for i in $RPM_BUILD_ROOT%{_libdir}/wx/config/*
do
b=`basename $i`
- cp $i $RPM_BUILD_ROOT%{_bindir}/wx-`echo $b|sed -e 's/\(.*\)-release-.*/\1/'`-config
+ c=`echo $b|sed -e 's/\(.*\)-%{majver}/\1/'`
+ if [ "$b" = "$c" ]; then
+ echo "Something is not right... Sed rule failed"
+ exit 1
+ fi
+ cp $i $RPM_BUILD_ROOT%{_bindir}/wx-${c}-config
done
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -617,7 +623,7 @@ rm -rf $RPM_BUILD_ROOT
%postun -n wxX11-unicode -p /sbin/ldconfig
%define _libf %{?with_debug:d}
-%define _configf %{?with_debug:-debug}-3.0
+%define _configf %{?with_debug:-debug-%{majver}}
%files -f wxstd.lang
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/b35e60d3dc7e4e46ff55e976e23f63ededf6f91c
More information about the pld-cvs-commit
mailing list