diff --git a/.cvsignore b/.cvsignore index 082e311..879e3b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -abiword-2.6.4.tar.gz -abiword-docs-2.6.4.tar.gz -abiword-extras-2.6.4.tar.gz -abiword-plugins-2.6.4.tar.gz +abiword-2.6.5.tar.gz +abiword-docs-2.6.5.tar.gz +abiword-extras-2.6.5.tar.gz +abiword-plugins-2.6.5.tar.gz diff --git a/abiword.spec b/abiword.spec index 4c5bf9c..64bb1f1 100644 --- a/abiword.spec +++ b/abiword.spec @@ -1,13 +1,13 @@ %define majorversion 2 %define minorversion 6 -%define microversion 4 +%define microversion 5 %define olpc_build 1 Summary: The AbiWord word processor Name: abiword Version: %{majorversion}.%{minorversion}.%{microversion} -Release: 6%{?dist} +Release: 1%{?dist} Epoch: 1 Group: Applications/Editors License: GPLv2+ @@ -148,8 +148,6 @@ cd $RPM_BUILD_DIR/abiword-%{version} make install DESTDIR=$RPM_BUILD_ROOT # overwrite the static binary with the dynamic one mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword -# Fix script permission -chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts/abw2html.pl # install abiword-plugins cd $RPM_BUILD_DIR/abiword-plugins-%{version} @@ -187,8 +185,6 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la # nuke custom dictionary files rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/dictionary/ispell_dictionary_list.xml -# nuke whacky scripts -rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{majorversion}.%{minorversion}/scripts %clean rm -rf $RPM_BUILD_ROOT @@ -218,6 +214,9 @@ update-desktop-database %{_datadir}/applications %{_libdir}/pkgconfig/%{name}-%{majorversion}.%{minorversion}.pc %changelog +* Sun Nov 23 2008 Marc Maurer - 1:2.6.5-1 +- New upstream release + * Wed Jul 23 2008 Marc Maurer - 1:2.6.4-6 - Remove unmaintained scripts that cause a perl dependency diff --git a/sources b/sources index 234fa86..42c9b59 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -16748b2d6e318e0e2a25581005e1943a abiword-2.6.4.tar.gz -9f8c0cd81d8889cc90550049f40a484a abiword-docs-2.6.4.tar.gz -d0893e611d37c3ba09b77fa720a3904d abiword-extras-2.6.4.tar.gz -3bf973c5a1446ef3eaf980724821d6e9 abiword-plugins-2.6.4.tar.gz +edce76a1da515dfc102a0e030f722002 abiword-2.6.5.tar.gz +7e35f9050219427d77a85172474caa64 abiword-docs-2.6.5.tar.gz +b279a0fa521b33e3a103dadb6784ead2 abiword-extras-2.6.5.tar.gz +6e38e0efc40421591ae4cc0d5202a796 abiword-plugins-2.6.5.tar.gz