Merge branch 'f24' into f23

This commit is contained in:
Jon Ciesla 2016-05-24 22:00:22 -05:00
commit c96e3a39ec
4 changed files with 16 additions and 6 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ scribus-1.3.8.tar.bz2
/scribus-1.4.3-free.tar.xz
/scribus-1.4.4-free.tar.xz
/scribus-1.4.5-free.tar.xz
/scribus-1.4.6-free.tar.xz

View File

@ -8,14 +8,14 @@ fi
version=$1
nv=scribus-${version}
archive=${nv}.tar.bz2
archive=${nv}.tar.xz
freearchive=${nv}-free.tar.xz
[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.bz2
[ -f ${archive} ] || curl -OL http://downloads.sourceforge.net/scribus/scribus-${version}.tar.xz
echo "Extracting sources ..."
rm -rf ${nv}
tar -xf $archive
tar -xJf $archive
pushd ${nv}

View File

@ -1,6 +1,6 @@
Name: scribus
Version: 1.4.5
Release: 7%{?dist}
Version: 1.4.6
Release: 1%{?dist}
Summary: DeskTop Publishing application written in Qt
Group: Applications/Productivity
# swatches bring in the fun licenses
@ -187,6 +187,15 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Tue May 24 2016 Jon Ciesla <limburgher@gmail.com> - 1.4.6-1
- 1.4.6
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> - 1.4.5-8
- Rebuilt for Boost 1.60
* Tue Jan 12 2016 Tom Callaway <spot@fedoraproject.org> - 1.4.5-7
- fix license tag, remove found non-free swatches (bz 1297262)

View File

@ -1 +1 @@
e72d488c8993f025ca796f32e01351a4 scribus-1.4.5-free.tar.xz
106b2b55bfb87cab65d2d952dbaf7fea scribus-1.4.6-free.tar.xz