diff --git a/cmake-2.6.diff b/cmake-2.6.diff new file mode 100644 index 0000000..e7af54d --- /dev/null +++ b/cmake-2.6.diff @@ -0,0 +1,10 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -193,6 +193,7 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2 -Wall") + + + INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) ++INCLUDE (CheckIncludeFile) + TEST_BIG_ENDIAN(WORDS_BIGENDIAN) + + #FIND DEPENDENCIES diff --git a/scribus.changes b/scribus.changes index be5131e..e390234 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 14 20:02:25 CEST 2008 - dmueller@suse.de + +- fix build against cmake 2.6 +- sync buildrequires with the community package + ------------------------------------------------------------------- Sun Jan 13 22:34:08 CET 2008 - dmueller@suse.de diff --git a/scribus.spec b/scribus.spec index 843fcfd..a775635 100644 --- a/scribus.spec +++ b/scribus.spec @@ -10,8 +10,11 @@ # norootforbuild + Name: scribus -BuildRequires: cairo-devel cups cups-devel kdelibs3-devel python-devel shared-mime-info +BuildRequires: cairo-devel cups cups-devel python-devel shared-mime-info +BuildRequires: fontconfig-devel libtiff-devel libxml2-devel openssl-devel +BuildRequires: gcc-c++ pkgconfig BuildRequires: cmake %if %suse_version < 1000 BuildRequires: libjpeg-devel @@ -29,9 +32,10 @@ Suggests: AdobeICCProfiles Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words Version: 1.3.3.11 -Release: 1 +Release: 40 Source: %{name}-%{version}.tar.bz2 Patch3: %{name}-1.3.3.10-doc-path.diff +Patch4: cmake-2.6.diff Url: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Open Source Page Layout and Desktop Publishing (DTP) @@ -72,6 +76,7 @@ Authors: %prep %setup -q %patch3 +%patch4 %build mkdir build @@ -121,16 +126,19 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/man/pl/man1 %changelog -* Sun Jan 13 2008 - dmueller@suse.de +* Mon Apr 14 2008 dmueller@suse.de +- fix build against cmake 2.6 +- sync buildrequires with the community package +* Mon Jan 14 2008 dmueller@suse.de - update to 1.3.3.11: * Special characters in plain text files aren't imported correctly * Change text string in PDF export dialog -* Tue Jan 08 2008 - stbinner@suse.de +* Tue Jan 08 2008 stbinner@suse.de - update to 1.3.3.10, many bugfixes - for details see ChangeLog -* Wed Jun 27 2007 - dmueller@suse.de +* Wed Jun 27 2007 dmueller@suse.de - build against cmake to fix various issues -* Wed Jun 13 2007 - ltinkl@suse.cz +* Wed Jun 13 2007 ltinkl@suse.cz - update to 1.3.3.9 bugfix release - many bugfixes - more translation updates @@ -142,119 +150,119 @@ rm -rf $RPM_BUILD_ROOT - improvements to the SVG importer - improvements to the Open Document Draw importer - improvements to PDF forms -* Mon Apr 23 2007 - pgajdos@suse.cz +* Mon Apr 23 2007 pgajdos@suse.cz - fixed doc paths in spec file -* Mon Mar 12 2007 - pgajdos@suse.cz +* Mon Mar 12 2007 pgajdos@suse.cz - fixed gcc warnings in beta version: * program uses possibly exploitable format strings (format-not-literal.patch) * program compares a char* pointer with string literal (string-literal-comparsion.patch) * added CFLAG -fno-strict-aliasing inside scribus.spec -* Thu Mar 08 2007 - pgajdos@suse.cz +* Thu Mar 08 2007 pgajdos@suse.cz - fixed 'warning: comparsion with string literal' (#233016, #228963) - string-literal-comparsion.patch -* Sun Jan 28 2007 - stbinner@suse.de +* Sun Jan 28 2007 stbinner@suse.de - Updated to bugfix release 1.3.3.7 -* Thu Nov 09 2006 - sbrabec@suse.cz +* Thu Nov 09 2006 sbrabec@suse.cz - Fixed python detection (#213668). -* Sat Nov 04 2006 - stbinner@suse.de +* Sat Nov 04 2006 stbinner@suse.de - fix build for < 10.1 -* Wed Oct 18 2006 - sbrabec@suse.cz +* Wed Oct 18 2006 sbrabec@suse.cz - Updated to version 1.3.3.4: * Purely a bug fix release. * Translations updated. -* Tue Aug 08 2006 - stbinner@suse.de +* Tue Aug 08 2006 stbinner@suse.de - update to version 1.3.3.3 "stable usable development version" * Fix borked color names and wrong Bitstream Vera rendering * Many crash und other minor bug fixes * Several translation updates -* Thu Jul 13 2006 - stbinner@suse.de +* Thu Jul 13 2006 stbinner@suse.de - fix build for <10.1 -* Wed May 31 2006 - adrian@suse.de +* Wed May 31 2006 adrian@suse.de - update to version 1.3.3.2 "stable usable development version" * more than 200 bugs and feature requests got implemented * fix for pdf export using Adobe Reader 7.x * new language translations -* Mon May 29 2006 - schwab@suse.de +* Mon May 29 2006 schwab@suse.de - Don't strip binaries. -* Mon Feb 20 2006 - sbrabec@suse.cz +* Mon Feb 20 2006 sbrabec@suse.cz - Export dynamic symbols from scribus binary (#148279). -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 - schwab@suse.de +* Sat Jan 21 2006 schwab@suse.de - Don't strip binaries. -* Tue Jan 10 2006 - sbrabec@suse.cz +* Tue Jan 10 2006 sbrabec@suse.cz - Re-enabled desktop file translation. -* Fri Jan 06 2006 - sbrabec@suse.cz +* Fri Jan 06 2006 sbrabec@suse.cz - Updated to version 1.2.4.1. -* Thu Jan 05 2006 - sbrabec@suse.cz +* Thu Jan 05 2006 sbrabec@suse.cz - Updated to version 1.2.4. -* Tue Jan 03 2006 - sbrabec@suse.cz +* Tue Jan 03 2006 sbrabec@suse.cz - Suggest AdobeICCProfiles. -* Wed Dec 07 2005 - sbrabec@suse.cz +* Wed Dec 07 2005 sbrabec@suse.cz - Search for ICC profiles in subdirectories. http://bugs.scribus.net/view.php?id=2882 -* Fri Nov 25 2005 - sbrabec@suse.cz +* Fri Nov 25 2005 sbrabec@suse.cz - Fixed devel splitting (#117811). - Resource /usr/local/share/color/icc. http://bugs.scribus.net/view.php?id=2864 - Enabled parallel build. -* Tue Oct 25 2005 - sbrabec@suse.cz +* Tue Oct 25 2005 sbrabec@suse.cz - Updated to version 1.2.3. - Install MIME info files. -* Wed Jul 27 2005 - sbrabec@suse.cz +* Wed Jul 27 2005 sbrabec@suse.cz - Provide and obsolete scribus-short-words. -* Wed Jul 13 2005 - sbrabec@suse.cz +* Wed Jul 13 2005 sbrabec@suse.cz - Updated to version 1.2.2.1. - Removed unneeded static modules and .la files for modules. -* Wed Jan 26 2005 - sbrabec@suse.cz +* Wed Jan 26 2005 sbrabec@suse.cz - Obsoleted old documentation packages. -* Tue Jan 11 2005 - sbrabec@suse.cz +* Tue Jan 11 2005 sbrabec@suse.cz - Updated to version 1.2.1. -* Thu Dec 16 2004 - coolo@suse.de +* Thu Dec 16 2004 coolo@suse.de - fix unsermake install -* Wed Sep 15 2004 - sbrabec@suse.cz +* Wed Sep 15 2004 sbrabec@suse.cz - Worked-around bi-arch bugs by forcing /usr/lib (#44961). http://bugs.scribus.net/bug_view_advanced_page.php?bug_id=0001057 -* Sun Sep 05 2004 - coolo@suse.de +* Sun Sep 05 2004 coolo@suse.de - fixing build requires -* Tue Aug 31 2004 - sbrabec@suse.cz +* Tue Aug 31 2004 sbrabec@suse.cz - Updated to version 1.2. -* Fri Aug 27 2004 - sbrabec@suse.cz +* Fri Aug 27 2004 sbrabec@suse.cz - Updated to version 1.2RC1. -* Thu Apr 01 2004 - ro@suse.de +* Thu Apr 01 2004 ro@suse.de - run update_admin to get current libtool macros - some more configure hackery to adapt to updated kde-macros to finally find python on lib64 platforms -* Wed Mar 31 2004 - sf@suse.de +* Wed Mar 31 2004 sf@suse.de - add scribus-1.1.5-c++.diff (#37208) -* Tue Mar 30 2004 - sbrabec@suse.cz +* Tue Mar 30 2004 sbrabec@suse.cz - Updated to version 1.1.6. -* Thu Mar 04 2004 - sbrabec@suse.cz +* Thu Mar 04 2004 sbrabec@suse.cz - Updated to version 1.1.5. -* Mon Feb 23 2004 - sbrabec@suse.cz +* Mon Feb 23 2004 sbrabec@suse.cz - Fixed and turned on CUPS support. -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Fri Aug 22 2003 - sbrabec@suse.cz +* Fri Aug 22 2003 sbrabec@suse.cz - Updated to version 1.0.1. -* Fri Aug 15 2003 - adrian@suse.de +* Fri Aug 15 2003 adrian@suse.de - install desktop file -* Thu Aug 14 2003 - ro@suse.de +* Thu Aug 14 2003 ro@suse.de - run update_admin (autoreconf in kde-style) - change prefix/lib to libdir in all Makefile.am -* Tue Aug 12 2003 - sbrabec@suse.cz +* Tue Aug 12 2003 sbrabec@suse.cz - Updated to version 1.0. -* Thu Jun 12 2003 - ro@suse.de +* Thu Jun 12 2003 ro@suse.de - add doc-dir to filelist -* Mon Mar 31 2003 - ro@suse.de +* Mon Mar 31 2003 ro@suse.de - fix build on lib64 -* Mon Feb 10 2003 - sbrabec@suse.cz +* Mon Feb 10 2003 sbrabec@suse.cz - Fix Qt path for biarch. -* Mon Feb 10 2003 - sbrabec@suse.cz +* Mon Feb 10 2003 sbrabec@suse.cz - Updated to version 0.9.7. -* Wed Nov 20 2002 - sbrabec@suse.cz +* Wed Nov 20 2002 sbrabec@suse.cz - Added new package. - FHS fixes. - Aufoconf fixes.