Kolab Groupware OBS

Changes of Revision 15

roundcubemail-plugins-kolab.spec Changed

@@ -219,19 +219,6 @@
 %description -n roundcubemail-plugin-kolab_tags
 Plugin kolab_tags
 
-%package -n roundcubemail-plugin-kolab_zpush
-Summary:        Plugin kolab_zpush
-Group:          Applications/Internet
-Requires:       roundcubemail(core) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_zpush-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-kolab_zpush-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(plugin-jqueryui) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_zpush) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush
-Plugin kolab_zpush
-
 %package -n roundcubemail-plugin-ldap_authentication
 Summary:        Plugin ldap_authentication
 Group:          Applications/Internet
@@ -435,14 +422,6 @@
 %description -n roundcubemail-plugin-kolab_tags-assets
 Plugin kolab_tags Assets
 
-%package -n roundcubemail-plugin-kolab_zpush-assets
-Summary:        Plugin kolab_zpush Assets
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_zpush-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush-assets
-Plugin kolab_zpush Assets
-
 %package -n roundcubemail-plugin-ldap_authentication-assets
 Summary:        Plugin ldap_authentication Assets
 Group:          Applications/Internet
@@ -667,30 +646,6 @@
 %description -n roundcubemail-plugin-kolab_tags-skin-larry
 Plugin kolab_tags / Skin larry
 
-%package -n roundcubemail-plugin-kolab_zpush-skin-larry
-Summary:        Plugin kolab_zpush / Skin larry
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_zpush) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-larry) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_zpush-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_zpush-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_zpush-skin-larry) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush-skin-larry
-Plugin kolab_zpush / Skin larry
-
-%package -n roundcubemail-plugin-kolab_zpush-skin-classic
-Summary:        Plugin kolab_zpush / Skin classic
-Group:          Applications/Internet
-Requires:       roundcubemail(plugin-kolab_zpush) = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       roundcubemail(skin-classic) >= %{roundcube_version}
-Requires:       roundcubemail(plugin-kolab_zpush-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_zpush-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
-Provides:       roundcubemail(plugin-kolab_zpush-skin-classic) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush-skin-classic
-Plugin kolab_zpush / Skin classic
-
 %package -n roundcubemail-plugin-tasklist-skin-larry
 Summary:        Plugin tasklist / Skin larry
 Group:          Applications/Internet
@@ -799,22 +754,6 @@
 %description -n roundcubemail-plugin-kolab_tags-skin-larry-assets
 Plugin kolab_tags / Skin larry (Assets Package)
 
-%package -n roundcubemail-plugin-kolab_zpush-skin-larry-assets
-Summary:        Plugin kolab_zpush / Skin larry (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_zpush-skin-larry-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush-skin-larry-assets
-Plugin kolab_zpush / Skin larry (Assets Package)
-
-%package -n roundcubemail-plugin-kolab_zpush-skin-classic-assets
-Summary:        Plugin kolab_zpush / Skin classic (Assets)
-Group:          Applications/Internet
-Provides:       roundcubemail(plugin-kolab_zpush-skin-classic-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n roundcubemail-plugin-kolab_zpush-skin-classic-assets
-Plugin kolab_zpush / Skin classic (Assets Package)
-
 %package -n roundcubemail-plugin-libcalendaring-skin-larry-assets
 Summary:        Plugin libcalendaring / Skin larry (Assets)
 Group:          Applications/Internet
@@ -854,6 +793,7 @@
 
 pushd %{name}-%{version}
 
+rm -rf plugins/kolab_zpush
 rm -rf plugins/owncloud
 
 # Remove the results of patching when there's an incidental offset
@@ -1318,11 +1258,6 @@
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
 fi
 
-%pre -n roundcubemail-plugin-kolab_zpush
-if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
-fi
-
 %pre -n roundcubemail-plugin-ldap_authentication
 if [ -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     %{__rm} -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted"
@@ -1563,21 +1498,6 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-%posttrans -n roundcubemail-plugin-kolab_zpush
-if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
-    if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
-        if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini)" ]; then
-%if 0%{?with_systemd}
-            /bin/systemctl condrestart %{httpd_name}.service
-%else
-            /sbin/service %{httpd_name} condrestart
-%endif
-        fi
-    fi
-    %{__mkdir_p} %{_localstatedir}/lib/rpm-state/roundcubemail/
-    touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
-fi
-
 %posttrans -n roundcubemail-plugin-ldap_authentication
 if [ ! -f "%{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted" ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
@@ -1795,9 +1715,6 @@
 %files -n roundcubemail-plugin-kolab_tags -f plugin-kolab_tags.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_zpush -f plugin-kolab_zpush.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-ldap_authentication -f plugin-ldap_authentication.files
 %defattr(-,root,root,-)
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/ldap_authentication.inc.php
@@ -1868,9 +1785,6 @@
 %files -n roundcubemail-plugin-kolab_tags-assets -f plugin-kolab_tags-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_zpush-assets -f plugin-kolab_zpush-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-ldap_authentication-assets -f plugin-ldap_authentication-assets.files
 %defattr(-,root,root,-)
 
@@ -1937,12 +1851,6 @@
 %files -n roundcubemail-plugin-kolab_tags-skin-larry -f plugin-kolab_tags-skin-larry.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_zpush-skin-larry -f plugin-kolab_zpush-skin-larry.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_zpush-skin-classic -f plugin-kolab_zpush-skin-classic.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-tasklist-skin-larry -f plugin-tasklist-skin-larry.files
 %defattr(-,root,root,-)
 
@@ -1982,12 +1890,6 @@
 %files -n roundcubemail-plugin-kolab_tags-skin-larry-assets -f plugin-kolab_tags-skin-larry-assets.files
 %defattr(-,root,root,-)
 
-%files -n roundcubemail-plugin-kolab_zpush-skin-larry-assets -f plugin-kolab_zpush-skin-larry-assets.files
-%defattr(-,root,root,-)
-
-%files -n roundcubemail-plugin-kolab_zpush-skin-classic-assets -f plugin-kolab_zpush-skin-classic-assets.files
-%defattr(-,root,root,-)
-
 %files -n roundcubemail-plugin-libcalendaring-skin-larry-assets -f plugin-libcalendaring-skin-larry-assets.files
 %defattr(-,root,root,-)