Changes of Revision 3

libkolabxml.spec Changed
x
 
1
@@ -169,14 +169,11 @@
2
 %if 0%{?with_php} > 0
3
 Requires:       php-devel >= 5.3
4
 %if 0%{?plesk}
5
-%if 0%{?rhel} < 8 || 0%{?fedora}
6
-Requires:       plesk-php56-devel
7
-Requires:       plesk-php70-devel
8
-%endif
9
-Requires:       plesk-php71-devel
10
 Requires:       plesk-php72-devel
11
 Requires:       plesk-php73-devel
12
 Requires:       plesk-php74-devel
13
+Requires:       plesk-php80-devel
14
+Requires:       plesk-php81-devel
15
 %endif
16
 %endif
17
 %if 0%{?with_python} > 0
18
@@ -264,14 +261,11 @@
19
 BuildRequires:  php >= 5.3
20
 BuildRequires:  php-devel >= 5.3
21
 %if 0%{?plesk}
22
-%if 0%{?rhel} < 8 || 0%{?fedora}
23
-BuildRequires:  plesk-php56-devel
24
-BuildRequires:  plesk-php70-devel
25
-%endif
26
-BuildRequires:  plesk-php71-devel
27
 BuildRequires:  plesk-php72-devel
28
 BuildRequires:  plesk-php73-devel
29
 BuildRequires:  plesk-php74-devel
30
+BuildRequires:  plesk-php80-devel
31
+BuildRequires:  plesk-php81-devel
32
 %endif
33
 
34
 %description -n php-kolabformat
35
@@ -280,38 +274,6 @@
36
 %endif
37
 
38
 %if 0%{?plesk}
39
-%if 0%{?rhel} < 8 || 0%{?fedora}
40
-%package -n plesk-php56-kolabformat
41
-Summary:        libkolabxml bindings for Plesk's PHP 5.6
42
-Group:          System Environment/Libraries
43
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
44
-Requires:       libkolabxml%{?_isa} = %{version}
45
-Requires:       plesk-php56
46
-
47
-%description -n plesk-php56-kolabformat
48
-libkolabxml bindings for Plesk's PHP 5.6
49
-
50
-%package -n plesk-php70-kolabformat
51
-Summary:        libkolabxml bindings for Plesk's PHP 7.0
52
-Group:          System Environment/Libraries
53
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
54
-Requires:       libkolabxml%{?_isa} = %{version}
55
-Requires:       plesk-php70
56
-
57
-%description -n plesk-php70-kolabformat
58
-libkolabxml bindings for Plesk's PHP 7.0
59
-%endif
60
-
61
-%package -n plesk-php71-kolabformat
62
-Summary:        libkolabxml bindings for Plesk's PHP 7.1
63
-Group:          System Environment/Libraries
64
-Provides:       php-bindings(libkolabxml) = %{version}-%{release}
65
-Requires:       libkolabxml%{?_isa} = %{version}
66
-Requires:       plesk-php71
67
-
68
-%description -n plesk-php71-kolabformat
69
-libkolabxml bindings for Plesk's PHP 7.1
70
-
71
 %package -n plesk-php72-kolabformat
72
 Summary:        libkolabxml bindings for Plesk's PHP 7.2
73
 Group:          System Environment/Libraries
74
@@ -410,16 +372,6 @@
75
 %endif
76
 
77
 %if 0%{?plesk}
78
-%if 0%{?rhel} < 8 || 0%{?fedora}
79
-cp -a libkolabxml-%{version} libkolabxml-%{version}-5.6
80
-
81
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.0
82
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.0/src/php/CMakeLists.txt
83
-%endif
84
-
85
-cp -a libkolabxml-%{version} libkolabxml-%{version}-7.1
86
-sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.1/src/php/CMakeLists.txt
87
-
88
 cp -a libkolabxml-%{version} libkolabxml-%{version}-7.2
89
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.2/src/php/CMakeLists.txt
90
 
91
@@ -430,10 +382,10 @@
92
 sed -i "s/-php/-php7/g" libkolabxml-%{version}-7.4/src/php/CMakeLists.txt
93
 
94
 cp -a libkolabxml-%{version} libkolabxml-%{version}-8.0
95
-sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
96
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.0/src/php/CMakeLists.txt
97
 
98
 cp -a libkolabxml-%{version} libkolabxml-%{version}-8.1
99
-sed -i "s/-php/-php8/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
100
+sed -i "s/-php/-php7/g" libkolabxml-%{version}-8.1/src/php/CMakeLists.txt
101
 %endif
102
 
103
 %if 0%{?with_php7}
104
@@ -456,11 +408,6 @@
105
 popd
106
 
107
 %if 0%{?plesk}
108
-%if 0%{?rhel} < 8 || 0%{?fedora}
109
-cp %{name}-%{version}/tztable.h %{name}-%{version}-5.6/.
110
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.0/.
111
-%endif
112
-cp %{name}-%{version}/tztable.h %{name}-%{version}-7.1/.
113
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.2/.
114
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.3/.
115
 cp %{name}-%{version}/tztable.h %{name}-%{version}-7.4/.
116
@@ -553,11 +500,7 @@
117
 
118
 
119
 %if 0%{?plesk}
120
-%if 0%{?rhel} < 8 || 0%{?fedora}
121
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
122
-%else
123
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
124
-%endif
125
+for version in 7.2 7.3 7.4 8.0 8.1; do
126
     pushd %{name}-%{version}-${version}
127
     rm -rf build
128
     mkdir -p build
129
@@ -595,7 +538,6 @@
130
 mkdir -p \
131
     %{buildroot}/%{_datadir}/%{php} \
132
     %{buildroot}/%{php_inidir}/
133
-mv %{buildroot}/%{php_extdir}/kolabformat.php %{buildroot}/%{_datadir}/%{php}/kolabformat.php
134
 cat > %{buildroot}/%{php_inidir}/kolabformat.ini << EOF
135
 extension=kolabformat.so
136
 EOF
137
@@ -611,11 +553,7 @@
138
 %endif
139
 
140
 %if 0%{?plesk}
141
-%if 0%{?rhel} < 8 || 0%{?fedora}
142
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
143
-%else
144
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
145
-%endif
146
+for version in 7.2 7.3 7.4 8.0 8.1; do
147
     pushd %{name}-%{version}-${version}
148
     pushd build
149
     make install DESTDIR=%{buildroot} INSTALL='install -p'
150
@@ -626,10 +564,6 @@
151
         %{buildroot}/opt/plesk/php/${version}/etc/php.d/ \
152
         %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
153
 
154
-    mv \
155
-        %{buildroot}/opt/plesk/php/${version}/lib64/php/modules/kolabformat.php \
156
-        %{buildroot}/opt/plesk/php/${version}/share/php/kolabformat.php
157
-
158
     echo "extension=kolabformat.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini
159
     cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabformat.ini \
160
         %{buildroot}/opt/plesk/php/${version}/etc/php-fpm.d/
161
@@ -662,11 +596,7 @@
162
 %endif
163
 
164
 %if 0%{?plesk}
165
-%if 0%{?rhel} < 8 || 0%{?fedora}
166
-for version in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1; do
167
-%else
168
-for version in 7.1 7.2 7.3 7.4 8.0 8.1; do
169
-%endif
170
+for version in 7.2 7.3 7.4 8.0 8.1; do
171
     pushd %{name}-%{version}-${version}/build/
172
     export LD_LIBRARY_PATH=$( pwd )/src/
173
     /opt/plesk/php/${version}/bin/php -d enable_dl=On -dextension=src/php/kolabformat.so src/php/test.php ||:
174
@@ -713,66 +643,37 @@
175
 %if 0%{?with_php} > 0
176
 %files -n php-kolabformat
177
 %defattr(-,root,root,-)
178
-%{_datadir}/%{php}/kolabformat.php
179
 %{php_extdir}/kolabformat.so
180
 %config(noreplace) %{php_inidir}/kolabformat.ini
181
 
182
 %if 0%{?plesk}
183
-%if 0%{?rhel} < 8 || 0%{?fedora}
184
-%files -n plesk-php56-kolabformat
185
-%defattr(-,root,root,-)
186
-/opt/plesk/php/5.6/lib64/php/modules/kolabformat.so
187
-/opt/plesk/php/5.6/share/php/kolabformat.php
188
-/opt/plesk/php/5.6/etc/php.d/kolabformat.ini
189
-/opt/plesk/php/5.6/etc/php-fpm.d/kolabformat.ini
190
-
191
-%files -n plesk-php70-kolabformat
192
-%defattr(-,root,root,-)
193
-/opt/plesk/php/7.0/lib64/php/modules/kolabformat.so
194
-/opt/plesk/php/7.0/share/php/kolabformat.php
195
-/opt/plesk/php/7.0/etc/php.d/kolabformat.ini
196
-/opt/plesk/php/7.0/etc/php-fpm.d/kolabformat.ini
197
-%endif
198
-
199
-%files -n plesk-php71-kolabformat
200
-%defattr(-,root,root,-)
201
-/opt/plesk/php/7.1/lib64/php/modules/kolabformat.so
202
-/opt/plesk/php/7.1/share/php/kolabformat.php
203
-/opt/plesk/php/7.1/etc/php.d/kolabformat.ini
204
-/opt/plesk/php/7.1/etc/php-fpm.d/kolabformat.ini
205
-
206
 %files -n plesk-php72-kolabformat
207
 %defattr(-,root,root,-)
208
 /opt/plesk/php/7.2/lib64/php/modules/kolabformat.so
209
-/opt/plesk/php/7.2/share/php/kolabformat.php
210
 /opt/plesk/php/7.2/etc/php.d/kolabformat.ini
211
 /opt/plesk/php/7.2/etc/php-fpm.d/kolabformat.ini
212
 
213
 %files -n plesk-php73-kolabformat
214
 %defattr(-,root,root,-)
215
 /opt/plesk/php/7.3/lib64/php/modules/kolabformat.so
216
-/opt/plesk/php/7.3/share/php/kolabformat.php
217
 /opt/plesk/php/7.3/etc/php.d/kolabformat.ini
218
 /opt/plesk/php/7.3/etc/php-fpm.d/kolabformat.ini
219
 
220
 %files -n plesk-php74-kolabformat
221
 %defattr(-,root,root,-)
222
 /opt/plesk/php/7.4/lib64/php/modules/kolabformat.so
223
-/opt/plesk/php/7.4/share/php/kolabformat.php
224
 /opt/plesk/php/7.4/etc/php.d/kolabformat.ini
225
 /opt/plesk/php/7.4/etc/php-fpm.d/kolabformat.ini
226
 
227
 %files -n plesk-php80-kolabformat
228
 %defattr(-,root,root,-)
229
 /opt/plesk/php/8.0/lib64/php/modules/kolabformat.so
230
-/opt/plesk/php/8.0/share/php/kolabformat.php
231
 /opt/plesk/php/8.0/etc/php.d/kolabformat.ini
232
 /opt/plesk/php/8.0/etc/php-fpm.d/kolabformat.ini
233
 
234
 %files -n plesk-php81-kolabformat
235
 %defattr(-,root,root,-)
236
 /opt/plesk/php/8.1/lib64/php/modules/kolabformat.so
237
-/opt/plesk/php/8.1/share/php/kolabformat.php
238
 /opt/plesk/php/8.1/etc/php.d/kolabformat.ini
239
 /opt/plesk/php/8.1/etc/php-fpm.d/kolabformat.ini
240
 
241
debian.rules Changed
23
 
1
@@ -5,7 +5,7 @@
2
 PHPEXT := $(shell php-config --extension-dir)
3
 PHPINC := $(shell php-config --include-dir)
4
 
5
-PHP_VERSIONS=7.4 7.3 7.2 7.1 7.0 5.6
6
+PHP_VERSIONS=8.1 8.0 7.4 7.3 7.2 7.1 7.0 5.6
7
 
8
 export DH_VERBOSE=1
9
 export DH_OPTIONS=-v
10
@@ -128,7 +128,11 @@
11
    make -C php-vanilla install DESTDIR=$(PWD)/debian/tmp/ ; \
12
    mv -v debian/tmp/usr/lib/php*/$(PHPAPI)/kolabformat.php debian/tmp/usr/share/php/kolabformat.php
13
 
14
-   if  -d "/etc/php/7.4/mods-available/" ; then \
15
+   if  -d "/etc/php/8.1/mods-available/" ; then \
16
+       echo "debian/kolabformat.ini etc/php/8.1/mods-available" >> debian/php-kolabformat.install ; \
17
+   elif  -d "/etc/php/8.0/mods-available/" ; then \
18
+       echo "debian/kolabformat.ini etc/php/8.0/mods-available" >> debian/php-kolabformat.install ; \
19
+   elif  -d "/etc/php/7.4/mods-available/" ; then \
20
        echo "debian/kolabformat.ini etc/php/7.4/mods-available" >> debian/php-kolabformat.install ; \
21
    elif  -d "/etc/php/7.3/mods-available/" ; then \
22
        echo "debian/kolabformat.ini etc/php/7.3/mods-available" >> debian/php-kolabformat.install ; \
23