From 92d573d3a2e607b02e89726bf6a4ec44a74f2337 Mon Sep 17 00:00:00 2001 From: paulc Date: Thu, 26 Nov 2015 12:28:28 +0000 Subject: [PATCH] Tweaked the RPM dependency filtering for newer versions of rpmbuild. git-svn-id: http://voip.null.ro/svn/yate@6074 acf43c95-373e-0410-b603-e72c3f656dc1 --- packing/rpm/yate.spec.in | 10 ++++++++++ windows/yateversn.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packing/rpm/yate.spec.in b/packing/rpm/yate.spec.in index 4c995b39..a4208086 100644 --- a/packing/rpm/yate.spec.in +++ b/packing/rpm/yate.spec.in @@ -614,6 +614,13 @@ The devel package must still be installed separately. %prep %setup -q -n %{name} +# older rpmbuild uses these macro basic regexps +%define _provides_exceptions pear(libyate\\|devel(libyate +%define _requires_exceptions pear(libyate\\|devel(libyate\\|devel(libQt +# newer rpmbuild needs these global extended regexps +%global __provides_exclude pear\\(libyate|devel\\(libyate +%global __requires_exclude pear\\(libyate|devel\\(libyate|devel\\(libQt +# %if "%{no_auto_deps}" == "1" %define local_find_requires %{_builddir}/%{name}/local-find-requires %define local_find_provides %{_builddir}/%{name}/local-find-provides @@ -666,6 +673,9 @@ rm -rf %{buildroot} %changelog +* Thu Nov 26 2015 Paul Chitescu +- More tweaking to suppress unwanted dependencies in newer RPM + * Tue Apr 07 2015 Marian Podgoreanu - Renamed GSM Layer 3 radio library diff --git a/windows/yateversn.h b/windows/yateversn.h index 0c88d4dd..f6e11c18 100644 --- a/windows/yateversn.h +++ b/windows/yateversn.h @@ -35,7 +35,7 @@ #define YATE_VERSION "5.5.1" #define YATE_RELEASE "1" #define YATE_STATUS "devel" -#define YATE_REVISION "5970" +#define YATE_REVISION "6074" /* Windows version resource - file and string style */ #define YATE_WINVER_F 5,5,1,1