Author: sls Date: Tue Apr 1 23:21:13 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - use extras and docs - extras-destdir.patch in, mailmerge.patch out
---- Files affected: SPECS: abiword.spec (1.155 -> 1.156) ---- Diffs: ================================================================ Index: SPECS/abiword.spec diff -u SPECS/abiword.spec:1.155 SPECS/abiword.spec:1.156 --- SPECS/abiword.spec:1.155 Tue Apr 1 21:47:50 2008 +++ SPECS/abiword.spec Wed Apr 2 01:21:08 2008 @@ -5,6 +5,8 @@ # - restore cliparts # - complete descriptions # - fix broken bconds +# - consider subpackage for helps +# - consider lang()ed helps # - installed, but unpackaged files # /usr/include/abiword-2.6/abiwidget.h # /usr/include/abiword-2.6/xap_UnixTableWidget.h @@ -35,7 +37,7 @@ Summary(pl.UTF-8): Wieloplatformowy procesor tekstu Name: abiword Version: 2.6.0 -Release: 0.3 +Release: 0.4 Epoch: 1 License: GPL Group: X11/Applications @@ -43,9 +45,13 @@ # Source0-md5: d627a5d1061160c683f2257da498355b Source1: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-plugins-%{version}.tar.gz # Source1-md5: ebdc165d1b6c3c69f11148cf7841f257 +Source2: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-extras-%{version}.tar.gz +# Source2-md5: 3daf3cbd59621fab0326512bf663d2d9 +Source3: http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-docs-%{version}.tar.gz +# Source3-md5: 7403e74ee977e16fcaa7bcb24be16d23 Patch0: %{name}-desktop.patch Patch1: %{name}-home_etc.patch -Patch2: %{name}-mailmerge.patch +Patch2: %{name}-extras-destdir.patch Patch3: %{name}-poppler05x.patch Patch4: %{name}-goffice05.patch Patch5: %{name}-eps15.patch @@ -748,12 +754,11 @@ Jest to teczka clipartów używanych przez AbiWorda. %prep -%setup -q -a1 +%setup -q -a1 -a2 -a3 %patch0 -p1 # needs some work #patch1 -p1 -# seems applied -#patch2 -p1 +%patch2 -p0 #plugins stuff #patch3 -p1 @@ -792,6 +797,24 @@ %{!?with_goffice:--disable-abigoffice} \ %{!?with_xhtml:--disable-xhtml} %{__make} +cd .. + +export PKG_CONFIG_PATH=`pwd` +cd abiword-extras-%{version} +%{__aclocal} +%{__automake} +%{__autoconf} +%configure +%{__make} +cd .. + +export PATH="$PATH:`pwd`/src/wp/main/unix" +cd abiword-docs-%{version} +%{__aclocal} +%{__automake} +%{__autoconf} +%configure +%{__make} %install rm -rf $RPM_BUILD_ROOT @@ -803,6 +826,11 @@ DESTDIR=$RPM_BUILD_ROOT \ icondir=%{_pixmapsdir} +%{__make} -C abiword-extras-%{version} install \ + DESTDIR=$RPM_BUILD_ROOT +%{__make} -C abiword-docs-%{version} install \ + DESTDIR=$RPM_BUILD_ROOT + # Remove useless files rm -f $RPM_BUILD_ROOT%{_libdir}/abiword-%{mver}/plugins/*.la @@ -821,7 +849,9 @@ %dir %{_libdir}/abiword-%{mver} %dir %{_libdir}/abiword-%{mver}/plugins %dir %{_datadir}/abiword-%{mver} +%{_datadir}/abiword-%{mver}/dictionary %{_datadir}/abiword-%{mver}/glade +%{_datadir}/abiword-%{mver}/help %{_datadir}/abiword-%{mver}/readme.txt %{_datadir}/abiword-%{mver}/strings %{_datadir}/abiword-%{mver}/system.profile* @@ -1027,7 +1057,7 @@ %files clipart %defattr(644,root,root,755) -#{_datadir}/AbiSuite-%{mver}/clipart +%{_datadir}/abiword-%{mver}/clipart %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -1035,6 +1065,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.156 2008-04-01 23:21:08 sls +- use extras and docs +- extras-destdir.patch in, mailmerge.patch out + Revision 1.155 2008-04-01 19:47:50 sls - argh, need more coffee ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/abiword.spec?r1=1.155&r2=1.156&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
