dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: uuid
-# $Id$
-NAME := uuid
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

uuid.spec

@@ -1,6 +1,8 @@
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+
 Name:           uuid
 Version:        1.6.1
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
@@ -24,7 +26,7 @@ and Perl Data::UUID APIs.
 %package devel
 Summary:        Development support for Universally Unique Identifier library
 Group:          Development/Libraries
-Requires:       %{_libdir}/pkgconfig
+Requires:       pkgconfig
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
@@ -62,8 +64,14 @@ Perl OSSP uuid modules, which includes a Data::UUID replacement.
 Summary:        PHP support for Universally Unique Identifier library
 Group:          Development/Libraries
 BuildRequires:  php-devel
-Requires:       %{_libdir}/php/modules
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?php_zend_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
+%else
+Requires: php-api = %{php_apiver}
+%endif
+
 
 %description php
 PHP OSSP uuid module.
@@ -72,7 +80,7 @@ PHP OSSP uuid module.
 Summary:        PostgreSQL support for Universally Unique Identifier library
 Group:          Development/Libraries
 BuildRequires:  postgresql-devel
-Requires:       %{_libdir}/pgsql
+Requires:       postgresql%{_isa}
 Requires:       %{_datadir}/pgsql
 Requires:       %{name} = %{version}-%{release}
 
@@ -126,11 +134,11 @@ popd
 
 # Build the PHP module.
 pushd php
+export PHP_RPATH=no
 phpize
 CFLAGS="$RPM_OPT_FLAGS -I.. -L.. -L../.libs"
 %configure --enable-uuid
-sed -i -e '/^LDFLAGS =/s/-Wl,-rpath,[^[:space:]]*//' Makefile
-make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+make %{?_smp_mflags}
 popd
 
 %install
@@ -235,6 +243,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Wed Apr 21 2010 Michal Hlavinka <mhlavink@redhat.com> - 1.6.1-6
+- add php abi check (#511115)
+
+* Wed Apr 21 2010 Michal Hlavinka <mhlavink@redhat.com> - 1.6.1-5
+- change file requires to package requires (#504391, #533949)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild