Attachment 825935 Details for Bug 1031936 – Proposed patch for packaging issues

[patch] Proposed patch for packaging issues

php-extras.spec.patch (text/plain), 2.30 KB, created by Tuomo Soini on 2013-11-19 07:48:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tuomo Soini

Created: 2013-11-19 07:48:56 UTC

Size: 2.30 KB

patch

obsolete

>diff --git a/php-extras.spec b/php-extras.spec
>index 5e825c4..eb6eff7 100644
>--- a/php-extras.spec
>+++ b/php-extras.spec
>@@ -1,14 +1,12 @@
>-#  EPEL6:  recode, mcrypt, tidy, mssql, interbase
>+#  EPEL6:  mcrypt, mssql, interbase
> 
> %define def()	%%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}}
> 
>-#  recode
> %{expand:%def mcrypt}
>-%{expand:%def tidy}
> %{expand:%def mssql}
> %{expand:%def interbase}
> 
>-%define list	%{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_tidy:tidy} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
>+%define list	%{?_with_mcrypt:mcrypt} %{?_with_mssql:mssql pdo_dblib} %{?_with_interbase:interbase pdo_firebird}
> 
> %define opts	%{?_with_interbase:--with-interbase=%{_libdir}/firebird --with-pdo-firebird=%{_libdir}/firebird}
> 
>@@ -21,7 +19,7 @@ Name: php-extras
> Summary: Additional PHP modules from the standard PHP distribution
> #Version: %(php-config --version 2>/dev/null || echo 0)
> Version: 5.3.3
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> Group: Development/Languages
> License: The PHP License
> URL: http://www.php.net/
>@@ -38,16 +36,6 @@ This package contains various additional modules for PHP, which
> have not been included in the basic PHP package for Fedora Core.
> 
> 
>-%package -n php-recode
>-Summary: Standard PHP module provides GNU recode support
>-Group: Development/Languages
>-Requires: php-api = %{apiver}
>-%{?_with_recode:BuildRequires: recode-devel}
>-
>-%description -n php-recode
>-Standard PHP module provides GNU recode support
>-
>-
> %package -n php-mcrypt
> Summary: Standard PHP module provides mcrypt library support
> Group: Development/Languages
>@@ -58,16 +46,6 @@ Requires: php-api = %{apiver}
> Standard PHP module provides mcrypt library support
> 
> 
>-%package -n php-tidy
>-Summary: Standard PHP module provides tidy library support
>-Group: Development/Languages
>-Requires: php-api = %{apiver}
>-%{?_with_tidy:BuildRequires: libtidy-devel}
>-
>-%description -n php-tidy
>-Standard PHP module provides tidy library support
>-
>-
> %package -n php-mssql
> Summary: Standard PHP module provides mssql support
> Group: Development/Languages
>@@ -224,9 +202,7 @@ rm -rf $RPM_BUILD_ROOT
> 
> #%%files
> %define fil()	%%{?_with_%1:%%files -n php-%1 -f files.%1}
>-%{expand:%fil recode}
> %{expand:%fil mcrypt}
>-%{expand:%fil tidy}
> %{expand:%fil mssql}
> %{expand:%fil interbase}
>

Actions: View | Diff

Attachments on bug 1031936: 825935