Accepting request 650031 from home:Vogtinator:branches:KDE:Extra

- Replace desktopfile.diff by proper use of %suse_update_desktop_file
- Clean up the .spec file
- Mark kbibtexrc as %config

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

desktopfile.diff

@@ -1,12 +0,0 @@
-diff -ur a/src/program/org.kde.kbibtex.desktop b/src/program/org.kde.kbibtex.desktop
---- a/src/program/org.kde.kbibtex.desktop	2018-06-21 22:00:30.000000000 +0200
-+++ b/src/program/org.kde.kbibtex.desktop	2018-06-29 13:07:52.851674788 +0200
-@@ -85,7 +85,7 @@
- X-KDE-StartupNotify=true
- # TODO X-DBUS-StartupType=Multi
- # TODO X-DBUS-ServiceName=org.kde.kbibtex
--Categories=Qt;KDE;Office;Database;Science;Literature;Education;
-+Categories=Qt;KDE;Office;Database;Science;Education;
- MimeType=text/x-bibtex;application/x-research-info-systems;
- Keywords=BibTeX;bibliography;editor;LaTeX;
- Keywords[ca]=BibTeX;bibliografia;editor;LaTeX;

kbibtex.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Nov 18 16:45:13 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Replace desktopfile.diff by proper use of %suse_update_desktop_file
+- Clean up the .spec file
+- Mark kbibtexrc as %config
+
 -------------------------------------------------------------------
 Wed Sep 12 10:38:21 UTC 2018 - Cor Blom <cornelis@solcon.nl>
 

kbibtex.spec

@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,24 +22,11 @@ Release:        0
 Summary:        The BibTeX (Latex) bibliography manager by KDE
 License:        GPL-2.0-only
 Group:          Productivity/Publishing/TeX/Utilities
-Url:            https://userbase.kde.org/KBibTeX/
+URL:            https://userbase.kde.org/KBibTeX/
 Source:         http://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE: revert upstream desktop file change to solve rpmlint error
-Patch0:         desktopfile.diff
 # PATCH-FIX-UPSTREAM: backported fix for kde#398136
 Patch1:         kde398136.patch
 BuildRequires:  extra-cmake-modules
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5Widgets)
-# Only include WebEngine for platforms that support it
-%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
-BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
-%else
-BuildRequires:  pkgconfig(Qt5WebKitWidgets)
-%endif
 BuildRequires:  kcompletion-devel
 BuildRequires:  kcoreaddons-devel
 BuildRequires:  kcrash-devel
@@ -55,16 +42,26 @@ BuildRequires:  kxmlgui-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libpoppler-qt5-devel
 BuildRequires:  libqca-qt5-devel
+BuildRequires:  pkgconfig
 BuildRequires:  qoauth-qt5-devel
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(Qt5Concurrent)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(Qt5XmlPatterns)
-Recommends:     %{name}-lang
-Requires(post):    shared-mime-info
 Requires(post): desktop-file-utils
-Requires(postun):  shared-mime-info
+Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Requires(postun): shared-mime-info
+Recommends:     %{name}-lang
+# Only include WebEngine for platforms that support it
+%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
+BuildRequires:  pkgconfig(Qt5WebEngineWidgets)
+%else
+BuildRequires:  pkgconfig(Qt5WebKitWidgets)
+%endif
 
 %description
 KBibTeX is a BibTeX editor by KDE to edit bibliographies used with
@@ -84,9 +81,7 @@ This package contains the devel files for %{name}.
 %lang_package
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %cmake_kf5 -d build
@@ -94,42 +89,36 @@ make %{?_smp_mflags}
 
 %install
 %make_install -C build
-%suse_update_desktop_file org.kde.kbibtex Office Database
+%suse_update_desktop_file -r org.kde.kbibtex Qt KDE Office Database Science Education
 
 %find_lang %{name}
 
-%post
+%post -p /sbin/ldconfig
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
-
-%postun
-/sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc ChangeLog
 %license LICENSE
 %{_kf5_libdir}/libkbibtex*.so.*
-%_kf5_configdir/kbibtexrc
+%config %{_kf5_configdir}/kbibtexrc
-%_kf5_bindir/kbibtex
+%{_kf5_bindir}/kbibtex
-%_kf5_plugindir/kbibtexpart.so*
+%{_kf5_plugindir}/kbibtexpart.so*
-%_kf5_applicationsdir/org.kde.kbibtex.desktop
+%{_kf5_applicationsdir}/org.kde.kbibtex.desktop
-%_kf5_iconsdir/hicolor/*/apps/kbibtex.png
+%{_kf5_iconsdir}/hicolor/*/apps/kbibtex.png
-%_kf5_sharedir/kbibtex/
+%{_kf5_sharedir}/kbibtex/
-%_kf5_servicesdir/kbibtexpart.desktop
+%{_kf5_servicesdir}/kbibtexpart.desktop
-%_kf5_kxmlguidir/kbibtex/
+%{_kf5_kxmlguidir}/kbibtex/
-%_kf5_kxmlguidir/kbibtexpart/
+%{_kf5_kxmlguidir}/kbibtexpart/
 %dir %{_kf5_appstreamdir}
 %{_kf5_appstreamdir}/org.kde.kbibtex.appdata.xml
-%_kf5_htmldir/*/kbibtex/
+%{_kf5_htmldir}/*/kbibtex/
-%_kf5_sharedir/mime/packages/bibliography.xml
+%{_kf5_sharedir}/mime/packages/bibliography.xml
-%_kf5_sharedir/man/man1/kbibtex.1.gz
+%{_kf5_sharedir}/man/man1/kbibtex.1.gz
-%_kf5_sharedir/man/*/man1/kbibtex.1.gz
+%{_kf5_sharedir}/man/*/man1/kbibtex.1.gz
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
 %files devel
-%defattr(-,root,root)
+%{_kf5_libdir}/libkbibtex*.so
-%_kf5_libdir/libkbibtex*.so
 
 %changelog