Hello community, here is the log from the commit of package abiword checked in at Wed Jan 10 17:32:47 CET 2007. -------- --- GNOME/abiword/abiword.changes 2006-12-19 10:29:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/abiword/abiword.changes 2007-01-10 15:16:55.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 4 13:49:41 CET 2007 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ abiword.spec ++++++ --- /var/tmp/diff_new_pack.la5981/_old 2007-01-10 17:32:19.000000000 +0100 +++ /var/tmp/diff_new_pack.la5981/_new 2007-01-10 17:32:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package abiword (Version 2.4.5) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,7 +15,6 @@ %ifarch %ix86 ppc x86_64 BuildRequires: valgrind %endif -%define prefix /opt/gnome License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL) Group: Productivity/Office/Other Requires: ghostscript-fonts-std, ghostscript-fonts-other, gnome-icon-theme @@ -24,7 +23,7 @@ Obsoletes: abiword2 Summary: A Multiplatform Word Processor Version: 2.4.5 -Release: 34 +Release: 39 URL: http://www.abisource.com/ Source: %{name}-%{version}.tar.bz2 Patch2: abiword-uninited-vars.patch @@ -73,46 +72,34 @@ %build cd abi -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %if %suse_version > 1000 -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector" +export CFLAGS="$CFLAGS -fstack-protector" +export CXXFLAGS="$CXXFLAGS -fstack-protector" %endif -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=/etc%prefix \ - --enable-gnome \ - --enable-xft \ - --enable-scripting \ -%if 0 - --enable-iso-c=no \ -%endif - --with-gnomevfs \ +%configure\ + --enable-gnome\ + --enable-xft\ + --enable-scripting\ + --with-gnomevfs\ --with-sys-wv make %{?jobs:-j %jobs} cd ../abiword-plugins #./nextgen.sh sed -i 's/python2.3/python%{py_ver}/g' configure -CFLAGS="$RPM_OPT_FLAGS" \ -CXXFLAGS="$RPM_OPT_FLAGS" \ - ./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --sysconfdir=/etc%prefix +%configure make %{?jobs:-j %jobs} %install -rm -rf $RPM_BUILD_ROOT cd abi make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m644 abiword_48.png $RPM_BUILD_ROOT/usr/share/pixmaps +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m644 abiword_48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps cd ../abiword-plugins make DESTDIR=$RPM_BUILD_ROOT install %suse_update_desktop_file abiword Office WordProcessor GNOME -rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/AbiWord-2.4/plugins/*.*a +rm $RPM_BUILD_ROOT%{_libdir}/AbiWord-2.4/plugins/*.*a %clean rm -rf $RPM_BUILD_ROOT @@ -120,14 +107,17 @@ %files %defattr(-,root,root) %doc abi/COPYING abi/COPYRIGHT.TXT abi/CREDITS.TXT abi/README.TXT abi/BiDiReadme.txt abi/docs -%{prefix}/bin/* -%{prefix}/%_lib/AbiWord-2.4 -%{prefix}/share/AbiSuite-2.4 -%{prefix}/share/applications/*.desktop -%{prefix}/share/icons/*.png -/usr/share/pixmaps/*.png +%{_bindir}/* +%{_libdir}/AbiWord-2.4 +%{_datadir}/AbiSuite-2.4 +%{_datadir}/applications/*.desktop +%{_datadir}/icons/*.png +%{_datadir}/pixmaps/*.png %changelog -n abiword +* Thu Jan 04 2007 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. * Tue Dec 19 2006 - meissner@suse.de - fixed build fail due to warnings. * Tue Nov 07 2006 - ro@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org