SPECS: libiodbc.spec - new bcond style

[darekr]

Author: darekr                       Date: Thu Jul 21 17:51:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new bcond style

---- Files affected:
SPECS:
   libiodbc.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/libiodbc.spec
diff -u SPECS/libiodbc.spec:1.23 SPECS/libiodbc.spec:1.24
--- SPECS/libiodbc.spec:1.23	Thu Oct 28 11:58:32 2004
+++ SPECS/libiodbc.spec	Thu Jul 21 19:51:29 2005
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_gtk	- don't build iodbcadm and GUI elements in drvproxy
+%bcond_without gtk		# don't build iodbcadm and GUI elements in drvproxy
 #
 Summary:	iODBC Driver Manager
 Summary(pl):	Zarządca sterowników iODBC
@@ -41,7 +41,7 @@
 Summary:	Header files for iODBC development
 Summary(pl):	Pliki nagłówkowe do rozwoju aplikacji na iODBC
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 The iODBC Driver Manager is a free implementation of the SAG CLI and
@@ -65,7 +65,7 @@
 Summary:	Static version of iODBC libraries
 Summary(pl):	Statyczna wersja bibliotek iODBC
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static version of iODBC libraries.
@@ -77,7 +77,7 @@
 Summary:	GTK+-based GUI for iODBC administration
 Summary(pl):	Oparty o GTK+ interfejs do administrowania iODBC
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description gtk
 GTK+-based GUI for iODBC administration.
@@ -94,7 +94,7 @@
 %{__automake}
 %{__autoconf}
 %configure \
-	%{?_without_gtk:--disable-gui}
+	%{!?with_gtk:--disable-gui}
 
 %{__make}
 
@@ -126,7 +126,7 @@
 %doc AUTHORS ChangeLog LICENSE LICENSE.BSD NEWS README
 %attr(755,root,root) %{_libdir}/libiodbc.so.*.*.*
 %attr(755,root,root) %{_libdir}/libiodbcinst.so.*.*.*
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/odbc.ini
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbc.ini
 
 %files devel
 %defattr(644,root,root,755)
@@ -142,7 +142,7 @@
 %{_libdir}/libiodbc.a
 %{_libdir}/libiodbcinst.a
 
-%if 0%{!?_without_gtk:1}
+%if 0%{with gtk}
 %files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/iodbcadm-gtk
@@ -158,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/07/21 17:51:29  darekr
+- new bcond style
+
 Revision 1.23  2004/10/28 09:58:32  paladine
 - "GTK+" unification (hope thats all)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libiodbc.spec?r1=1.23&r2=1.24&f=u