|
@@ -1,17 +1,17 @@
|
|
-%define desktop_file_utils_version 0.9
|
|
+%define desktop_file_utils_version 0.16
|
|
-%define abiver 2.6
|
|
+%define abiver 2.8
|
|
|
|
|
|
Summary: The AbiWord word processor
|
|
Summary: The AbiWord word processor
|
|
Summary(ja): AbiWord ワードプロセッサ
|
|
Summary(ja): AbiWord ワードプロセッサ
|
|
Name: abiword
|
|
Name: abiword
|
|
-Version: 2.6.8
|
|
+Version: 2.8.6
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
Epoch: 1
|
|
Epoch: 1
|
|
Group: Applications/Productivity
|
|
Group: Applications/Productivity
|
|
License: GPLv2+
|
|
License: GPLv2+
|
|
Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
|
|
Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
|
|
-Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz
|
|
+## Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-plugins-%{version}.tar.gz
|
|
-Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
|
|
+## Source2: http://abisource.com/downloads/abiword/%{version}/source/abiword-extras-%{version}.tar.gz
|
|
Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
|
|
Source3: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
|
|
Source11: abiword.mime
|
|
Source11: abiword.mime
|
|
|
|
|
|
@@ -53,7 +53,7 @@ BuildRequires: libbonobo-devel
|
|
BuildRequires: libbonoboui-devel
|
|
BuildRequires: libbonoboui-devel
|
|
BuildRequires: libgnomeui-devel
|
|
BuildRequires: libgnomeui-devel
|
|
|
|
|
|
-PreReq: desktop-file-utils >= %{desktop_file_utils_version}
|
|
+Requires(pre): desktop-file-utils >= %{desktop_file_utils_version}
|
|
Obsoletes: abiword-fonts abiword-plugins
|
|
Obsoletes: abiword-fonts abiword-plugins
|
|
|
|
|
|
URL: http://www.abisource.com/
|
|
URL: http://www.abisource.com/
|
|
@@ -96,15 +96,15 @@ libabiword で開発するためのインクルードファイル及び定義フ
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-%patch1 -p1 -b .desktop
|
|
+## %patch1 -p1 -b .desktop
|
|
%patch2 -p1 -b .boolean
|
|
%patch2 -p1 -b .boolean
|
|
|
|
|
|
# setup abiword-plugins
|
|
# setup abiword-plugins
|
|
-%setup -q -T -b 1 -n abiword-plugins-%{version}
|
|
+## %setup -q -T -b 1 -n abiword-plugins-%{version}
|
|
-%patch3 -p1 -b .boolean
|
|
+## %patch3 -p1 -b .boolean
|
|
|
|
|
|
# setup abiword extras
|
|
# setup abiword extras
|
|
-%setup -q -T -b 2 -n abiword-extras-%{version}
|
|
+## %setup -q -T -b 2 -n abiword-extras-%{version}
|
|
|
|
|
|
# setup abiword documentation
|
|
# setup abiword documentation
|
|
%setup -q -T -b 3 -n abiword-docs-%{version}
|
|
%setup -q -T -b 3 -n abiword-docs-%{version}
|
|
@@ -113,29 +113,29 @@ libabiword で開発するためのインクルードファイル及び定義フ
|
|
%build
|
|
%build
|
|
# build libabiword and abiword
|
|
# build libabiword and abiword
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
-%configure --enable-libabiword
|
|
+%configure --enable-libabiword -enable-static=no
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
# build abiword-plugins
|
|
# build abiword-plugins
|
|
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
|
|
+## cd $RPM_BUILD_DIR/abiword-plugins-%{version}
|
|
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
|
|
+## export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
|
|
-CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
|
|
+## CXXFLAGS="-L$RPM_BUILD_DIR/%{name}-%{version}/src/wp/main/unix/" %configure --disable-gda --enable-libabiword --with-abiword=$RPM_BUILD_DIR/%{name}-%{version}
|
|
-# Remove libtool predep_objects and postdep_objects wonkiness so that
|
|
+## # Remove libtool predep_objects and postdep_objects wonkiness so that
|
|
-# building without -nostdlib doesn't include them twice. Because we
|
|
+## # building without -nostdlib doesn't include them twice. Because we
|
|
-# already link with g++, weird stuff happens if you don't let the
|
|
+## # already link with g++, weird stuff happens if you don't let the
|
|
-# compiler handle this.
|
|
+## # compiler handle this.
|
|
-sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
|
|
+## sed 's/^predep_objects=.*/predep_objects=\"\"/' < libtool > libtool.foo
|
|
-sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
|
|
+## sed 's/^postdep_objects=.*/postdep_objects=\"\"/' < libtool.foo > libtool.foobar
|
|
-sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
|
|
+## sed 's/-shared -nostdlib/-shared/' < libtool.foobar > libtool
|
|
-make %{?_smp_mflags}
|
|
+## make %{?_smp_mflags}
|
|
|
|
|
|
# build abiword-extras
|
|
# build abiword-extras
|
|
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
|
|
+## cd $RPM_BUILD_DIR/abiword-extras-%{version}
|
|
-# abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info
|
|
+## # abiword-extras looks at the abiword-%{version}.pc pkg-config file to get its location info
|
|
-# however, that file is not installed yet, so just point to it in the abiword source tree
|
|
+## # however, that file is not installed yet, so just point to it in the abiword source tree
|
|
-export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
|
|
+## export PKG_CONFIG_PATH="$RPM_BUILD_DIR/%{name}-%{version}"
|
|
-%configure
|
|
+## %configure
|
|
-make
|
|
+## make
|
|
|
|
|
|
# build the documentation
|
|
# build the documentation
|
|
cd $RPM_BUILD_DIR/abiword-docs-%{version}
|
|
cd $RPM_BUILD_DIR/abiword-docs-%{version}
|
|
@@ -148,18 +148,18 @@ rm -rf $RPM_BUILD_ROOT
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
make install DESTDIR=$RPM_BUILD_ROOT
|
|
# overwrite the static binary with the dynamic one
|
|
# 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
|
|
+## mv -f $RPM_BUILD_DIR/abiword-%{version}/src/wp/main/unix/abiword-dynamic $RPM_BUILD_ROOT%{_bindir}/abiword
|
|
|
|
|
|
# Fix script permission
|
|
# Fix script permission
|
|
#chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{abiver}/scripts/abw2html.pl
|
|
#chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}-%{abiver}/scripts/abw2html.pl
|
|
|
|
|
|
# install abiword-plugins
|
|
# install abiword-plugins
|
|
-cd $RPM_BUILD_DIR/abiword-plugins-%{version}
|
|
+## cd $RPM_BUILD_DIR/abiword-plugins-%{version}
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
+## make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
# install the extras
|
|
# install the extras
|
|
-cd $RPM_BUILD_DIR/abiword-extras-%{version}
|
|
+## cd $RPM_BUILD_DIR/abiword-extras-%{version}
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
+## make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
# install the documentation
|
|
# install the documentation
|
|
cd $RPM_BUILD_DIR/abiword-docs-%{version}
|
|
cd $RPM_BUILD_DIR/abiword-docs-%{version}
|
|
@@ -169,8 +169,8 @@ cp -rp help/* $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{abiver}/AbiWord/help/
|
|
find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{abiver}/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
|
|
find $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{abiver}/AbiWord/help/ -type d -exec chmod -c o+rx {} \;
|
|
|
|
|
|
# finish up
|
|
# finish up
|
|
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
|
|
+## mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/
|
|
-cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
|
|
+## cp $RPM_BUILD_DIR/abiword-extras-%{version}/icons/abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/abiword_48.png
|
|
|
|
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
cd $RPM_BUILD_DIR/abiword-%{version}
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
|
|
@@ -187,9 +187,13 @@ install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
|
|
|
|
|
|
# nuke .la files
|
|
# nuke .la files
|
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{abiver}/plugins/*.la
|
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{abiver}/plugins/*.la
|
|
|
|
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
|
|
|
+# nuke .a files
|
|
|
|
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
|
|
# nuke custom dictionary files
|
|
# nuke custom dictionary files
|
|
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{abiver}/dictionary/ispell_dictionary_list.xml
|
|
rm -f $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{abiver}/dictionary/ispell_dictionary_list.xml
|
|
|
|
|
|
|
|
+
|
|
%clean
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
@@ -204,8 +208,9 @@ update-desktop-database %{_datadir}/applications
|
|
%{_bindir}/abiword
|
|
%{_bindir}/abiword
|
|
%{_datadir}/applications/*
|
|
%{_datadir}/applications/*
|
|
%{_datadir}/mime-info/*
|
|
%{_datadir}/mime-info/*
|
|
-%{_datadir}/pixmaps/*png
|
|
+## %{_datadir}/pixmaps/*png
|
|
%{_datadir}/icons/*png
|
|
%{_datadir}/icons/*png
|
|
|
|
+%{_mandir}/man1/abiword.1.gz
|
|
|
|
|
|
%files -n libabiword
|
|
%files -n libabiword
|
|
%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
|
|
%doc $RPM_BUILD_DIR/%{name}-%{version}/docs $RPM_BUILD_DIR/%{name}-%{version}/COPYING $RPM_BUILD_DIR/%{name}-%{version}/COPYRIGHT.TXT $RPM_BUILD_DIR/%{name}-%{version}/README.TXT
|
|
@@ -218,6 +223,12 @@ update-desktop-database %{_datadir}/applications
|
|
%{_libdir}/pkgconfig/*.pc
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Jul 19 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:2.8.6-1
|
|
|
|
+- new upstream release
|
|
|
|
+- drop Source1, Source2
|
|
|
|
+- drop Patch1, Patch3
|
|
|
|
+- fix %setup, %build, %install and %files
|
|
|
|
+
|
|
* Thu Jul 29 2009 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 1:2.6.8-2
|
|
* Thu Jul 29 2009 KANEKO Seiji <giraffe@m2.pbc.ne.jp> 1:2.6.8-2
|
|
- add Japanese Summary and description
|
|
- add Japanese Summary and description
|
|
- add BuildRequires: libSM-devel
|
|
- add BuildRequires: libSM-devel
|