Kolab Groupware OBS

Changes of Revision 15

roundcubemail.spec Changed

@@ -48,15 +48,16 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.5.3
+%global rc_version 1.5
 %global plugin_version 3.5.11
 %global skin_version 0.5.0
 #%%global rc_rel_suffix rc2.12
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
+%global basedir %{name}-%{rc_version}%{?dash_rel_suffix}
 
 Name:           roundcubemail
-Version:        %{rc_version}
+Version:        %{rc_version}.4
 
 Release:        4%{?dot_rel_suffix}%{?dist}
 
@@ -66,7 +67,7 @@
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
+Source0:        roundcubemail-%{rc_version}.tar.gz
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
@@ -283,9 +284,9 @@
 Roundcube Webmail for Kolab
 
 %prep
-%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
+%setup -q -c "%{basedir}"
 
-pushd %{name}-%{version}%{?dash_rel_suffix}
+pushd %{basedir}
 
 cp -vf "%{SOURCE200}" SQL/mysql/
 rm -rvf SQL/mysql/2016081200.sql
@@ -351,9 +352,9 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG.md,LICENSE,README.md} .
+cp -a %{basedir}/{CHANGELOG.md,LICENSE,README.md} .
 
-rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
+rm -rf %{basedir}/plugins/jqueryui/themes/redmond
 
 
 %build
@@ -372,7 +373,7 @@
     %{buildroot}%{tmpdir}/plugins \
     %{buildroot}%{tmpdir}/plugins/enigma
 
-pushd %{name}-%{version}%{?dash_rel_suffix}
+pushd %{basedir}
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -421,8 +422,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
-asset_dir="%{name}-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{basedir}"
+asset_dir="%{basedir}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 #TODO?
@@ -492,7 +493,7 @@
 
 
 %check
-pushd %{name}-%{version}%{?dash_rel_suffix}/tests
+pushd %{basedir}/tests
 phpunit --debug || :
 popd
 
@@ -586,9 +587,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
-%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
-%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
+%doc %{basedir}/LICENSE
+%doc %{basedir}/UPGRADING
+%doc %{basedir}/SQL
 
 %{_datadir}/%{name}/
 %{_sharedstatedir}/%{name}/

buildroundcubemailtarball.sh Changed

roundcubemail-1.5.tar.gz Added