[Tizen-submit] 21759: Changes to Tizen:IVI/php

noreply at tizen.org noreply at tizen.org
Fri Feb 28 09:52:25 GMT 2014


Hi,
Ronan Le Martret have made the following changes to php in project Tizen:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #21759

  submit:       Tizen:IVI:build/php(cleanup) -> Tizen:IVI


Message:
Submitter: Ronan Le Martret <ronan at fridu.net>
Comments: Remove xpm dependency for pure Wayland profile.
Git project: platform/upstream/php
Tag: submit/tizen/20140228.095122
Commit: 018a13c5c90843ac5cb523ac94f7de05e14ca60f Remove xpm dependency for pure Wayland profile.

State:   new        2014-02-28T09:52:05 tizenrobot
Comment: <no comment>
changes files:
--------------

old:
----
  0001-add-packaging.patch

new:
----
  f2e19ea-to-d0efdca.diff

spec files:
-----------
--- php.spec
+++ php.spec
@@ -1,3 +1,4 @@
+%bcond_with x
 #
 
 %define suhosin_version 0.9.33
@@ -5,6 +6,7 @@
 %define with_suhosin_patch 0
 %define pkg_name php
 Name:           php
+VCS:            platform/upstream/php#018a13c5c90843ac5cb523ac94f7de05e14ca60f
 %global apiver      20090626
 %global zendver     20090626
 
@@ -33,7 +35,9 @@
 BuildRequires:  pkgconfig(libpng12)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(rpm)
+%if %{with x}
 BuildRequires:  pkgconfig(xpm)
+%endif
 
 %define extension_dir     %{_libdir}/%{pkg_name}/extensions
 %define peardir           %{_datadir}/%{pkg_name}/PEAR
@@ -41,7 +45,6 @@
 %define _x11prefix %(pkg-config --variable=prefix xft)
 Version:        5.3.18
 Release:        0
-VCS:            platform/upstream/php#submit/tizen/20130912.090545-0-ge1c92e5244e5d4be1d5f4958bab4f90562a1e22a
 License:        PHP-3.01
 Summary:        PHP5 Core Files
 Url:            http://www.php.net
@@ -52,7 +55,7 @@
 Source7:        install-pear-nozlib.phar
 Source1001: 	php.manifest
 # Patches auto-generated by git-buildpackage:
-Patch0:         0001-add-packaging.patch
+Patch0:         f2e19ea-to-d0efdca.diff
 Requires:       timezone
 Provides:       php
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -569,7 +572,7 @@
 
 %prep
 %setup -q -n php-%{version}
-# 0001-add-packaging.patch
+# f2e19ea-to-d0efdca.diff
 %patch0 -p1
 cp %{SOURCE1001} .
 cp %{SOURCE5} .
@@ -695,7 +698,9 @@
     --with-curl=shared \
     --with-gd=shared \
         --enable-gd-native-ttf \
+%if %{with x}
         --with-xpm-dir=%{_x11prefix} \
+%endif
         --with-freetype-dir=%{_prefix} \
         --with-png-dir=%{_prefix} \
         --with-jpeg-dir=%{_prefix} \

other changes:
--------------

++++++ f2e19ea-to-d0efdca.diff (new)
--- f2e19ea-to-d0efdca.diff
+++ f2e19ea-to-d0efdca.diff
@@ -0,0 +1,22 @@
+From: jenkins <None>
+Date: Fri, 28 Feb 2014 01:51:41 -0800
+Subject: Raw diff f2e19ea..d0efdca
+

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list