SPECS: odbtp.spec - removed php-odbtp package, there's php-pecl-od...

[glen]

Author: glen                         Date: Tue Sep 20 22:26:29 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed php-odbtp package, there's php-pecl-odbtp available (if there's reason for otherwise, please revert and state what's the difference, or fix php-pecl-odbtp)

---- Files affected:
SPECS:
   odbtp.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/odbtp.spec
diff -u SPECS/odbtp.spec:1.14 SPECS/odbtp.spec:1.15
--- SPECS/odbtp.spec:1.14	Thu Sep 15 23:04:56 2005
+++ SPECS/odbtp.spec	Wed Sep 21 00:26:24 2005
@@ -1,12 +1,11 @@
 # $Revision$, $Date$
 # TODO
-# - what about php-pecl-odbtp? one of php-odbtp or php-pecl-odbtp must die
 # - fix this: /sbin/ldconfig: /usr/lib/libodbtp-1.1.so is not a symbolic link
 Summary:	Accessing win32-based databases using TCP/IP protocol
 Summary(pl):	Dostęp do baz danych opartych na win32 za pomocą protokołu TCP/IP
 Name:		odbtp
 Version:	1.1.2
-Release:	3.2
+Release:	3.4
 License:	LGPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -18,7 +17,6 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
-BuildRequires:	php-devel
 BuildRequires:	rpmbuild(macros) >= 1.238
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,23 +58,6 @@
 %description static -l pl
 Statyczna biblioteka odbtp.
 
-%package -n php-%{name}
-Summary:	odbtp extension (with MSSQL support) for PHP
-Summary(pl):	Moduł odbtp (ze wsparciem dla MSSQL) dla PHP
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-%{?requires_php_extension}
-Obsoletes:	php-pear-DB_odbtp
-Obsoletes:	php-pecl-odbtp
-
-%description -n php-%{name}
-This is a Dynamic Shared Object (DSO) for PHP that will add odbtp
-support. It is built with MSSQL support enabled.
-
-%description -n php-%{name} -l pl
-Moduł PHP umożliwiający korzystanie z biblioteki odbtp. Moduł
-został zbudowany z włączonym wsparciem dla MSSQL.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -94,45 +75,18 @@
 
 ln -s .libs/libodbtp.so libodbtp.so
 
-# build php extension too (with MSSQL support enabled)
-sdir=$(pwd)
-cd php/ext/odbtp
-phpize
-%configure \
-        --with-odbtp-mssql=../../../
-%{__make}
-cd $sdir
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},%{_sysconfdir}/php/conf.d,%{_libdir}/php}
-install php/ext/%{name}/modules/%{name}.so $RPM_BUILD_ROOT%{_libdir}/php
-install examples/odbtp.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d/odbtp.ini
-; Enable ODBTP extension module
-extension=odbtp.so
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post -n php-%{name}
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
-
-%postun -n php-%{name}
-if [ "$1" = 0 ]; then
-	[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-	[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README README.64bitOS docs
@@ -148,18 +102,15 @@
 %defattr(644,root,root,755)
 %{_libdir}/libodbtp.a
 
-%files -n php-%{name}
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/php/odbtp.so
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php/conf.d/odbtp.ini
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbtp/odbtp.conf
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/09/20 22:26:24  glen
+- removed php-odbtp package, there's php-pecl-odbtp available (if there's reason for otherwise, please revert and state what's the difference, or fix php-pecl-odbtp)
+
 Revision 1.14  2005/09/15 21:04:56  glen
 - removed libodbtp.so symlink override, added ldconfig todo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/odbtp.spec?r1=1.14&r2=1.15&f=u