- don't require ppp-plugin-devel on srcbuilder

[packages/isdn4k-utils.git] / isdn4k-utils.spec

diff --git a/isdn4k-utils.spec b/isdn4k-utils.spec
index d591ee4649a8396c428c1659ee9341c41d02d3ac..d8fe105d1e2e1a53ec866a3aa744912a67809f7c 100644 (file)
--- a/isdn4k-utils.spec
+++ b/isdn4k-utils.spec
@@ -3,8 +3,8 @@ Summary(pl):    Narz
 Summary(pt_BR):        Utilitários para configuração do subsistema ISDN
 Name:          isdn4k-utils
 Version:       040111
+Release:       2
 Epoch:         2
-Release:       1
 License:       GPL v2
 Group:         Applications/Communications
 Source0:       http://rk.pop.e-wro.pl/%{name}-%{version}.tar.gz
@@ -14,20 +14,21 @@ Patch0:             %{name}-make.patch
 Patch1:                %{name}-ppc.patch
 Patch2:                %{name}-pppdcapiplugin.patch
 Patch3:                %{name}-isdnlog_dont_touch_etc_services.patch
+Patch4:                %{name}-libdir.patch
 URL:           http://www.isdn4linux.de/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: ncurses-devel
+BuildRequires: ppp-plugin-devel
+BuildRequires: rpmbuild(macros) >= 1.145
 BuildRequires: tcl-devel >= 8.3.4-10
-BuildRequires: /usr/sbin/pppd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
 %define                xincludedir     /usr/X11R6/include/X11
 %define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
-%define                ppp_ver         %(/usr/sbin/pppd --version 2>&1 | sed -e "s/pppd\ version\ //")
-%define                ppp_pkg_ver     %(rpm -q --queryformat "%%{VERSION}-%%{RELEASE}" ppp-plugin-devel)
+%define                ppp_ver         %(awk -F'"' '/VERSION/ { print $2 }' /usr/include/pppd/patchlevel.h 2>/dev/null || echo ERROR)
 
 %description
 Utilities for the kernel ISDN-subsystem and some contributions.
@@ -42,7 +43,7 @@ Utilit
 Summary:       Utilities for the kernel ISDN-subsystem - frontend for X11
 Summary(pl):   Narzêdzia dla podsystemu ISDN j±dra - nakladki dla X11
 Group:         Applications/Communications
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description x11
 Utilities for the kernel ISDN-subsystem and some contributions (X11).
@@ -54,7 +55,7 @@ Narz
 Summary:       Developement files for isdn4k-tools
 Summary(pl):   Rzeczy potrzebne do programowania z u¿yciem isdn4k-tools
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Developement files for isdn4k-tools.
@@ -66,8 +67,7 @@ Rzeczy potrzebne do programowania z u
 Summary:       capiplugin for pppd-%{ppp_ver}
 Summary(pl):   Wtyczka capi dla pppd w wersji %{ppp_ver}
 Group:         Applications/Communications
-Requires:      ppp = %{ppp_pkg_ver}
-BuildRequires: ppp-plugin-devel
+%requires_eq_to        ppp ppp-plugin-devel
 
 %description -n ppp-plugin-capi
 capiplugin for pppd-%{ppp_ver}.
@@ -122,7 +122,7 @@ w wersji 2.0.
 Summary:       Static libraries for CAPI 2.0
 Summary(pl):   Statyczne biblioteki dla CAPI 2.0
 Group:         Development/Libraries
-Requires:      capi-devel = %{epoch}:%{version}
+Requires:      capi-devel = %{epoch}:%{version}-%{release}
 
 %description -n capi-libs-static
 The Common ISDN Application Programming Interface (CAPI for short)
@@ -143,7 +143,7 @@ w wersji 2.0.
 Summary:       CAPI 2.0 - development stuff
 Summary(pl):   CAPI 2.0 - zasoby programistyczne
 Group:         Development/Libraries
-Requires:      capi-libs = %{version}
+Requires:      capi-libs = %{version}-%{release}
 
 %description -n capi-devel
 The Common ISDN Application Programming Interface (CAPI for short)
@@ -189,10 +189,11 @@ zgodnego z CAPI sprz
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+
 %build
 for i in capi20 capifax capiinfo capiinit rcapid; do
        cd $i
-       rm -f missing
        %{__libtoolize}
        %{__aclocal}
        %{__autoconf}
@@ -202,6 +203,7 @@ done
 
 cp %{SOURCE1} .config
 %{__make} subconfig \
+       CONFIG_LIBDIR=%{_libdir} \
        OPTIM="%{rpmcflags}"\
        CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
 
@@ -215,6 +217,7 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},/var/lock/isdn,%{_datadir}/doc/%{name}-%{
 
 %{__make} install \
        PPPVERSION=%{ppp_ver} \
+       CONFIG_LIBDIR=%{_libdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/doc/isdn4linux/faq/*.txt \