Logoj0ke.net Open Build Service > Projects > internetx:php5:EL5:extensions > php-pear > Changes
Sign Up | Log In

Changes of Revision 2

[-] Changed php-pear.spec
x
 
1
@@ -1,21 +1,22 @@
2
 
3
-%define peardir %{_datadir}/pear
4
+%global peardir %{_datadir}/pear
5
 
6
-%define xmlrpcver 1.5.1
7
-%define getoptver 1.2.3
8
-%define arctarver 1.3.2
9
-%define structver 1.0.2
10
+%global xmlrpcver 1.5.2
11
+%global getoptver 1.2.3
12
+%global arctarver 1.3.3
13
+%global structver 1.0.2
14
+%global xmlutil   1.2.1
15
 
16
 Summary: PHP Extension and Application Repository framework
17
 Name: php-pear
18
-Version: 1.7.2
19
-Release: 2%{?dist}
20
+Version: 1.9.0
21
+Release: 1%{?dist}
22
 Epoch: 1
23
 License: PHP
24
 Group: Development/Languages
25
 URL: http://pear.php.net/package/PEAR
26
 Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
27
-# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.31 -O install-pear.php
28
+# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.39 -O install-pear.php
29
 Source1: install-pear.php
30
 Source2: relocate.php
31
 Source3: strip.php
32
@@ -28,6 +29,7 @@
33
 Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
34
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
35
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
36
+Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
37
 
38
 BuildArch: noarch
39
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40
@@ -37,6 +39,9 @@
41
 Provides: php-pear(PEAR) = %{version}
42
 Provides: php-pear(Structures_Graph) = %{structver}
43
 Provides: php-pear(XML_RPC) = %{xmlrpcver}
44
+Provides: php-pear(XML_Util) = %{xmlutil}
45
+Obsoletes: php-pear-XML-Util <= %{xmlutil}
46
+Provides:  php-pear-XML-Util = %{xmlutil}-%{release}
47
 Requires: php-cli >= 5.1.0-1
48
 
49
 %description
50
@@ -47,10 +52,12 @@
51
 %setup -cT
52
 
53
 # Create a usable PEAR directory (used by install-pear.php)
54
-for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23}
55
+for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
56
 do
57
     tar xzf  $archive --strip-components 1 || tar xzf  $archive --strip-path 1
58
 done
59
+tar xzf %{SOURCE24} package.xml
60
+mv package.xml XML_Util.xml
61
 
62
 # apply patches on used PEAR during install
63
 # -- no patch
64
@@ -74,6 +81,7 @@
65
 
66
 install -d $RPM_BUILD_ROOT%{peardir} \
67
            $RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
68
+           $RPM_BUILD_ROOT%{_localstatedir}/www/html \
69
            $RPM_BUILD_ROOT%{peardir}/.pkgxml \
70
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
71
            $RPM_BUILD_ROOT%{_sysconfdir}/pear
72
@@ -85,7 +93,8 @@
73
       %{SOURCE1} -d %{peardir} \
74
                  -c %{_sysconfdir}/pear \
75
                  -b %{_bindir} \
76
-                 %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE20}
77
+                 -w %{_localstatedir}/www/html \
78
+                 %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE20}
79
 
80
 # Replace /usr/bin/* with simple scripts:
81
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pear
82
@@ -106,12 +115,17 @@
83
            $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear     
84
 
85
 # apply patches on installed PEAR tree
86
-cd $RPM_BUILD_ROOT%{peardir} 
87
+pushd $RPM_BUILD_ROOT%{peardir} 
88
 # -- no patch
89
+popd
90
 
91
 # Why this file here ?
92
 rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
93
 
94
+# Need for re-registrying XML_Util
95
+install -m 644 XML_Util.xml $RPM_BUILD_ROOT%{peardir}/.pkgxml/
96
+
97
+
98
 %check
99
 # Check that no bogus paths are left in the configuration, or in
100
 # the generated registry files.
101
@@ -121,10 +135,17 @@
102
 grep /usr/local $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
103
 grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1
104
 
105
+
106
 %clean
107
 rm -rf $RPM_BUILD_ROOT
108
 rm new-pear.conf
109
 
110
+
111
+%triggerpostun -- php-pear-XML-Util
112
+# re-register extension unregistered during postun of obsoleted php-pear-XML-Util
113
+%{_bindir}/pear install --nodeps --soft --force --register-only %{pear_xmldir}/XML_Util.xml >/dev/null || :
114
+
115
+
116
 %files
117
 %defattr(-,root,root,-)
118
 %{peardir}
119
@@ -132,10 +153,26 @@
120
 %config(noreplace) %{_sysconfdir}/pear.conf
121
 %config %{_sysconfdir}/rpm/macros.pear
122
 %dir %{_localstatedir}/cache/php-pear
123
+%dir %{_localstatedir}/www/html
124
 %dir %{_sysconfdir}/pear
125
 %doc LICENSE README
126
 
127
+
128
 %changelog
129
+* Sat Sep 05 2009 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.0-1
130
+- update to PEAR 1.9.0, XML_RPC 1.5.2
131
+
132
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.1-2
133
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
134
+
135
+* Sat May 30 2009 Remi Collet <Fedora@FamilleCollet.com> 1:1.8.1-1
136
+- update to 1.8.1
137
+- Update install-pear.php script (1.39)
138
+- add XML_Util
139
+
140
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.2-3
141
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
142
+
143
 * Sun May 18 2008 Remi Collet <Fedora@FamilleCollet.com> 1:1.7.2-2
144
 - revert to install-pear.php script 1.31 (for cfg_dir)
145
 
146
@@ -144,7 +181,7 @@
147
 - Update install-pear.php script (1.32)
148
 
149
 * Tue Mar 11 2008 Tim Jackson <rpm@timj.co.uk> 1:1.7.1-2
150
-- Set cfg_dir to be %{_sysconfdir}/pear (and own it)
151
+- Set cfg_dir to be %%{_sysconfdir}/pear (and own it)
152
 - Update install-pear.php script
153
 - Add %%pear_cfgdir and %%pear_wwwdir macros
154
 
155
[+] Deleted Archive_Tar-1.3.2.tgz/Archive_Tar-1.3.2/Archive/Tar.php ^
[+] Added Archive_Tar-1.3.3.tgz/Archive_Tar-1.3.3/Archive/Tar.php ^
[+] Changed Archive_Tar-1.3.3.tgz/Archive_Tar-1.3.3/docs/Archive_Tar.txt ^
[+] Changed Archive_Tar-1.3.3.tgz/Archive_Tar-1.3.3/docs/Archive_Tar.txt ^
[+] Changed Archive_Tar-1.3.3.tgz/package.xml ^
[+] Changed Archive_Tar-1.3.3.tgz/package2.xml ^
Changed PEAR-1.9.0.tgz ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/Dump.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/RPC.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/Server.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/allgot.inc ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/empty-value-struct.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/empty-value.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/extra-lines.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/protoport.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/test_Dump.php ^
[+] Deleted XML_RPC-1.5.1.tgz/XML_RPC-1.5.1/tests/types.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/Dump.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/RPC.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/Server.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/allgot.inc ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/empty-value-struct.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/empty-value.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/extra-lines.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/protoport.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/test_Dump.php ^
[+] Added XML_RPC-1.5.2.tgz/XML_RPC-1.5.2/tests/types.php ^
[+] Changed XML_RPC-1.5.2.tgz/package.xml ^
[+] Changed XML_RPC-1.5.2.tgz/package2.xml ^
Added XML_Util-1.2.1.tgz ^
[+] Changed install-pear.php ^