Accepting request 101371 from home:TheBlackCat:branches:KDE:Distro:Factory

- Cleaned up spec file formatting
- Fix compilation in 11.4 and earlier

OBS-URL: https://build.opensuse.org/request/show/101371
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=9

kbibtex-0.4-compile-fix-1.patch

@@ -0,0 +1,22 @@
+--- src/gui/preferences/settingsabstractwidget.h	2011/10/15 18:31:08	924
++++ src/gui/preferences/settingsabstractwidget.h	2011/12/01 13:59:53	978
+@@ -24,6 +24,7 @@
+ #include <kbibtexgui_export.h>
+ 
+ #include <QWidget>
++#include <QAbstractItemModel>
+ 
+ class KComboBox;
+ 
+--- src/gui/bibtex/bibtexfileview.h	2011/07/16 18:29:29	821
++++ src/gui/bibtex/bibtexfileview.h	2011/09/05 08:21:08	851
+@@ -22,6 +22,8 @@
+ 
+ #include <QTreeView>
+ 
++#include <KSharedConfig>
++
+ #include <kbibtexgui_export.h>
+ 
+ class QSignalMapper;
+

kbibtex.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 24 10:38:37 UTC 2012 - toddrme2178@gmail.com
+
+- Cleaned up spec file formatting
+- Fix compilation in 11.4 and earlier
+
 -------------------------------------------------------------------
 Tue Nov 29 21:43:58 UTC 2011 - cornelis@solcon.nl
 

kbibtex.spec

@@ -1,63 +1,89 @@
 #
-# spec file for package KBibtex kde4 version 0.4
+# spec file for package kbibtex
 #
-# This file and all modifications and additions to the pristine
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# package are under the same license as the package itself.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-Name:           kbibtex
+Name:              kbibtex
-Version:        0.4
+Version:           0.4
-Release:        1
+Release:           1
-License:        GPL v2
+License:           GPL-2.0
+Summary:           The BibTeX (Latex) bibliography manager for KDE
+Url:               http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
+Group:             Productivity/Publishing/TeX/Utilities
+Source:            http://download.gna.org/kbibtex/%{version}/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM - already fixed post 0.4, remove in next release
+Patch0:            kbibtex-0.4-compile-fix-1.patch
+BuildRequires:     libkde4-devel
+BuildRequires:     libpoppler-qt4-devel
+BuildRequires:     update-desktop-files
+Requires(post):    shared-mime-info
+Requires(post):    desktop-file-utils
+Requires(postun):  shared-mime-info
+Requires(postun):  desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libkde4-devel,update-desktop-files,libpoppler-qt4-devel
-PreReq:         permissions
-Group:          Productivity/Publishing/TeX/Utilities
-Summary:        The BibTeX (Latex) bibliography manager for KDE
-URL:            http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
-Source:         http://download.gna.org/kbibtex/0.4/kbibtex-%{version}.tar.bz2
 %kde4_runtime_requires
 
-
 %description
-KBibTeX is a BibTeX editor for KDE to edit bibliographies used with LaTeX. Features include comfortable input masks, starting web queries (e. g. Google or PubMed) and exporting to PDF, PostScript, RTF and XML/HTML. As KBibTeX is using KDE's KParts technology, KBibTeX can be embedded into Kile or Konqueror. 
+KBibTeX is a BibTeX editor for KDE to edit bibliographies used with
-
+LaTeX. Features include comfortable input masks, starting web queries
-Authors:
+(e. g. Google or PubMed) and exporting to PDF, PostScript, RTF and
---------
+XML/HTML. As KBibTeX is using KDE's KParts technology, KBibTeX can be
-    Thomas Fischer <thomas.fischer@t-fischer.net>
+embedded into Kile or Konqueror.
 
 %prep
 %setup -q
+%patch0
 
 %build
-#mkdir build
-#cd build 
 %cmake_kde4 -d build
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 cd build
-make install DESTDIR=%{buildroot}
+%make_install
-mkdir -p $RPM_BUILD_ROOT%_kde4_iconsdir/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
+mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps
 for i in 16 22 32 48 64 128; do
-  cp ../icons/hi${i}-app-kbibtex.png  $RPM_BUILD_ROOT%_kde4_iconsdir/hicolor/${i}x${i}/apps/kbibtex.png
+  install -m 0644 ../icons/hi${i}-app-kbibtex.png  %{buildroot}%{_kde4_iconsdir}/hicolor/${i}x${i}/apps/kbibtex.png
 done
 %suse_update_desktop_file kbibtex Office Database
-%suse_update_desktop_file $RPM_BUILD_ROOT/%_kde4_sharedir/services/kbibtexpart.desktop Office Database
+%suse_update_desktop_file %{buildroot}/%{_kde4_servicesdir}/kbibtexpart.desktop Office Database
+%kde_post_install
 
-#%%find_lang kbibtex
+%post
+%mime_database_post
+%desktop_database_post
+
+%postun
+%mime_database_postun
+%desktop_database_postun
 
 %files
 %defattr(-,root,root)
-%_kde4_bindir/*
+%{_kde4_applicationsdir}/kbibtex.desktop
-%_kde4_libdir/*.so
+%{_kde4_appsdir}/kbibtex/
-%_kde4_modulesdir/*
+%{_kde4_appsdir}/kbibtexpart/
-%_kde4_iconsdir/hicolor
+%{_kde4_bindir}/kbibtex
-%_kde4_sharedir/apps
+%config %{_kde4_configdir}/kbibtexrc
-%_kde4_sharedir/config/kbibtexrc
+%{_kde4_datadir}/mime/packages/bibliography.xml
-%_kde4_sharedir/services
+%{_kde4_libdir}/libkbibtexgui.so
-%_kde4_applicationsdir/*
+%{_kde4_libdir}/libkbibtexio.so
-%{_mandir}/man1/kbibtex.1.gz
+%{_kde4_libdir}/libkbibtexproc.so
-/usr/share/mime/packages/bibliography.xml
+%{_kde4_libdir}/libkbibtexws.so
+%{_kde4_iconsdir}/hicolor/*/apps/kbibtex.png
+%{_kde4_mandir}/man1/kbibtex.1.gz
+%{_kde4_modulesdir}/kbibtexpart.so
+%{_kde4_servicesdir}/kbibtexpart.desktop
 
 %changelog