Hello community,

here is the log from the commit of package scribus for openSUSE:12.1 checked in 
at 2011-10-26 15:45:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/scribus (Old)
 and      /work/SRC/openSUSE:12.1/.scribus.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "scribus", Maintainer is "kde-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:12.1/scribus/scribus.changes     2011-10-24 
13:25:53.000000000 +0200
+++ /work/SRC/openSUSE:12.1/.scribus.new/scribus.changes        2011-10-28 
19:09:10.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Oct 26 08:11:42 UTC 2011 - co...@suse.com
+
+- merged KDF again
+
+-------------------------------------------------------------------
+Wed Oct 19 04:57:23 UTC 2011 - mrd...@opensuse.org
+
+-updated to 1.4.0.rc6
+-last RC before 1.4.0 final
+ +documentation updates, bug fixes and translation updates
+ +http://scribus.net/svn/Scribus/branches/Version135/Scribus/ChangeLog
+  for versioned changelog
+ 
+-------------------------------------------------------------------

Old:
----
  scribus-1.4.0.rc5.tar.bz2

New:
----
  scribus-1.4.0.rc6.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ scribus.spec ++++++
--- /var/tmp/diff_new_pack.U5oLMs/_old  2011-10-28 19:09:11.000000000 +0200
+++ /var/tmp/diff_new_pack.U5oLMs/_new  2011-10-28 19:09:11.000000000 +0200
@@ -19,8 +19,8 @@
 
 
 Name:           scribus
-Version:        1.4.0.rc5
-Release:        5
+Version:        1.4.0.rc6
+Release:        0
 License:        GPL
 Summary:        Open Source Page Layout and Desktop Publishing (DTP)
 Url:            http://www.scribus.net/
@@ -30,17 +30,20 @@
 
 BuildRequires:  aspell-devel
 BuildRequires:  boost-devel
+BuildRequires:  cairo-devel
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  cups-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  libQtWebKit-devel
 BuildRequires:  libpodofo-devel
 BuildRequires:  libqt4-devel >= 4.6.0
+BuildRequires:  libtiff-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(cairo)
-BuildRequires:  pkgconfig(libxml-2.0)
 
 %if 0%{?suse_version}
 Requires:       ghostscript-library
@@ -93,7 +96,6 @@
   %if "%{_lib}" == "lib64"
   -DWANT_LIB64=1 \
   %endif
-  -DDOCDIR:PATH=%{_docdir} \
   -DWANT_CAIRO=1 \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
   -DCMAKE_SKIP_RPATH=TRUE \
@@ -104,20 +106,15 @@
 %install
 
 cd build
-%make_install
-
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_datadir}/doc/packages/scribus
-
-ln -s %{buildroot}%{_datadir}/scribus/icons/scribus.png 
%{buildroot}%{_datadir}/pixmaps/scribus.png 
-
-ln -s %{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop  
%{buildroot}%{_datadir}/applications/vnd.scribus.desktop
+ make install \
+ DESTDIR=%{buildroot}
 
 %if 0%{?suse_version}
 %suse_update_desktop_file -i 
%{buildroot}%{_datadir}/mimelnk/application/vnd.scribus.desktop Office 
WordProcessor
 %endif
 
+#update the mime database
+
 %post
 if [ -f /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database /usr/share/mime > /dev/null
@@ -128,27 +125,21 @@
   /usr/bin/update-mime-database /usr/share/mime > /dev/null
 fi
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-, root, root)
-%{_docdir}/scribus
 %{_bindir}/scribus
 %{_mandir}/man?/*.*
 %{_mandir}/*/man?/*.*
 %{_libdir}/scribus
 %{_datadir}/mime/packages/scribus.xml
 %{_datadir}/scribus
-%doc %{_datadir}/doc/scribus
+%{_datadir}/doc/scribus
 # This should be owned by filesystem or man, but there are only scribus files:
 %lang(pl) %dir %{_mandir}/pl
 %lang(pl) %{_mandir}/pl/man1
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/vnd.scribus.desktop
-%{_datadir}/applications/vnd.scribus.desktop
-%{_datadir}/pixmaps/scribus.png 
 
 %files devel
 %defattr(-, root, root)

++++++ scribus-1.4.0.rc5.tar.bz2 -> scribus-1.4.0.rc6.tar.bz2 ++++++
/work/SRC/openSUSE:12.1/scribus/scribus-1.4.0.rc5.tar.bz2 
/work/SRC/openSUSE:12.1/.scribus.new/scribus-1.4.0.rc6.tar.bz2 differ: char 11, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to