Accepting request 78766 from KDE:Distro:Factory

-Fixed language file identification
-Removed redundant buildrequires
-Cleaned up spec file formatting (forwarded request 78748 from TheBlackCat)

OBS-URL: https://build.opensuse.org/request/show/78766
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=36

scribus.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 10 09:33:53 UTC 2011 - toddrme2178@gmail.com
+
+-Fixed language file identification
+-Removed redundant buildrequires
+-Cleaned up spec file formatting
+
 -------------------------------------------------------------------
 Sat Jun 18 19:13:42 UTC 2011 - mrdocs@opensuse.org
 

scribus.spec

@@ -30,22 +30,19 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 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} 
+%if 0%{?suse_version}
 Requires:       ghostscript-library
 Requires:       python-imaging
 Requires:       tk
@@ -77,11 +74,9 @@ Requires:       libstdc++-devel
 Requires:       zlib-devel
 
 %description devel
-This package provides the development headers for %{name}. It is most useful 
+This package provides the development headers for %{name}. It is most useful
 for developing plugins for %{name}.
 
-%define prefix   %_prefix
-
 %prep
 
 %setup -q
@@ -94,29 +89,28 @@ export CFLAGS="$CXXFLAGS -fno-strict-aliasing"
 mkdir build
 cd build
 cmake \
-  -DCMAKE_INSTALL_PREFIX=%prefix \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   %if "%{_lib}" == "lib64"
   -DWANT_LIB64=1 \
   %endif
+  -DDOCDIR:PATH=%{_docdir} \
   -DWANT_CAIRO=1 \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
   -DCMAKE_SKIP_RPATH=TRUE \
   ../
 
-make 
+make
 
 %install
 
 cd build
- make install \
- DESTDIR=%{buildroot}
+%make_install
 
 mkdir -p %{buildroot}%{_datadir}/doc/packages/scribus
-%if 0%{?suse_version} 
+%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
@@ -133,18 +127,17 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root)
-%doc %{_datadir}/doc/packages/scribus
-
+%{_docdir}/scribus
 %{_bindir}/scribus
 %{_mandir}/man?/*.*
 %{_mandir}/*/man?/*.*
 %{_libdir}/scribus
 %{_datadir}/mime/packages/scribus.xml
 %{_datadir}/scribus
-%{_datadir}/doc/scribus
+%doc %{_datadir}/doc/scribus
 # This should be owned by filesystem or man, but there are only scribus files:
 %lang(pl) %dir %{_mandir}/pl
-%{_mandir}/pl/man1 
+%lang(pl) %{_mandir}/pl/man1
 %dir %{_datadir}/mimelnk
 %dir %{_datadir}/mimelnk/application
 %{_datadir}/mimelnk/application/vnd.scribus.desktop