rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 5.0.0 beta2

Browse Source
This commit is contained in:
David Tardon 2015-06-09 10:53:29 +02:00
parent 6af1c7fb20
commit d08eb20952
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -72,3 +72,6 @@
/libreoffice-5.0.0.0.beta1.tar.xz /libreoffice-5.0.0.0.beta1.tar.xz
/libreoffice-help-5.0.0.0.beta1.tar.xz /libreoffice-help-5.0.0.0.beta1.tar.xz
/libreoffice-translations-5.0.0.0.beta1.tar.xz /libreoffice-translations-5.0.0.0.beta1.tar.xz
/libreoffice-5.0.0.0.beta2.tar.xz
/libreoffice-help-5.0.0.0.beta2.tar.xz
/libreoffice-translations-5.0.0.0.beta2.tar.xz

10
libreoffice.spec
View File

@ -3,8 +3,7 @@
# Should contain .alphaX / .betaX, if this is pre-release (actually # Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names, # pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place. # so we need a way to define it easily at one place.
%define libo__prerelease beta1 %define libo_prerelease .beta2
%define libo_prerelease .%{?libo__prerelease}
# rhbz#715152 state vendor # rhbz#715152 state vendor
%if 0%{?rhel} %if 0%{?rhel}
%define vendoroption --with-vendor="Red Hat, Inc." %define vendoroption --with-vendor="Red Hat, Inc."
@ -52,7 +51,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: %{libo_version}.0 Version: %{libo_version}.0
Release: 4%{?libo_prerelease}%{?dist} Release: 5%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
Group: Applications/Productivity Group: Applications/Productivity
URL: http://www.libreoffice.org/ URL: http://www.libreoffice.org/
@ -1159,7 +1158,7 @@ done \
%{!?-l:%{error:-l must be present}} %{!?-l:%{error:-l must be present}}
%prep %prep
%setup -q -n %{name}-%{version}%{?libo__prerelease} -b 1 -b 2 %setup -q -n %{name}-%{version}%{?libo_prerelease} -b 1 -b 2
rm -rf git-hooks */git-hooks rm -rf git-hooks */git-hooks
# set up git repo # set up git repo
@ -2442,6 +2441,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif %endif
%changelog %changelog
* Tue Jun 09 2015 David Tardon <dtardon@redhat.com> - 1:5.0.0.0-5.beta2
- update to 5.0.0 beta2
* Mon Jun 08 2015 David Tardon <dtardon@redhat.com> - 1:5.0.0.0-4.beta1 * Mon Jun 08 2015 David Tardon <dtardon@redhat.com> - 1:5.0.0.0-4.beta1
- rebuild for poppler 0.33 - rebuild for poppler 0.33

6
sources
View File

@ -7,6 +7,6 @@ a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh 12fb8b5b0d5132726e57b9b9fc7e22c4 libreoffice-multiliblauncher.sh
4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 4b87018f7fff1d054939d19920b751a0 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
e2da251fe25cb4220cb59c136d2887b1 libreoffice-5.0.0.0.beta1.tar.xz 8f48a9e0c97cb35d4aa2cfc10f5c4ee1 libreoffice-5.0.0.0.beta2.tar.xz
be3238a700633b48ef4113921fc22d75 libreoffice-help-5.0.0.0.beta1.tar.xz ec8c839f7a17b0022e5022150dcd7bde libreoffice-help-5.0.0.0.beta2.tar.xz
52ac16844a757867d5d24ea764c3d72f libreoffice-translations-5.0.0.0.beta1.tar.xz 2d2ef3bddf264cefe8063b16a05b6228 libreoffice-translations-5.0.0.0.beta2.tar.xz