Hello community,

here is the log from the commit of package kbibtex for openSUSE:Factory checked 
in at 2018-11-19 23:32:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kbibtex (Old)
 and      /work/SRC/openSUSE:Factory/.kbibtex.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kbibtex"

Mon Nov 19 23:32:32 2018 rev:4 rq:650039 version:0.8.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/kbibtex/kbibtex.changes  2018-09-13 
12:14:03.170122001 +0200
+++ /work/SRC/openSUSE:Factory/.kbibtex.new/kbibtex.changes     2018-11-19 
23:32:47.091135803 +0100
@@ -1,0 +2,8 @@
+Sun Nov 18 16:45:13 UTC 2018 - Fabian Vogt <[email protected]>
+
+- Replace desktopfile.diff by proper use of %suse_update_desktop_file
+- Clean up the .spec file
+- Mark kbibtexrc as %config
+- Add %bcond_without lang
+
+-------------------------------------------------------------------

Old:
----
  desktopfile.diff

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

Other differences:
------------------
++++++ kbibtex.spec ++++++
--- /var/tmp/diff_new_pack.qR0Ehw/_old  2018-11-19 23:32:53.183128770 +0100
+++ /var/tmp/diff_new_pack.qR0Ehw/_new  2018-11-19 23:32:53.187128766 +0100
@@ -12,34 +12,23 @@
 # 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/
 #
 
 
+%bcond_without lang
+
 Name:           kbibtex
 Version:        0.8.1
 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 +44,26 @@
 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 +83,7 @@
 %lang_package
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %cmake_kf5 -d build
@@ -94,42 +91,40 @@
 
 %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
 
+%if %{with lang}
 %find_lang %{name}
+%endif
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
 %doc ChangeLog
 %license LICENSE
 %{_kf5_libdir}/libkbibtex*.so.*
-%_kf5_configdir/kbibtexrc
-%_kf5_bindir/kbibtex
-%_kf5_plugindir/kbibtexpart.so*
-%_kf5_applicationsdir/org.kde.kbibtex.desktop
-%_kf5_iconsdir/hicolor/*/apps/kbibtex.png
-%_kf5_sharedir/kbibtex/
-%_kf5_servicesdir/kbibtexpart.desktop
-%_kf5_kxmlguidir/kbibtex/
-%_kf5_kxmlguidir/kbibtexpart/
+%config %{_kf5_configdir}/kbibtexrc
+%{_kf5_bindir}/kbibtex
+%{_kf5_plugindir}/kbibtexpart.so*
+%{_kf5_applicationsdir}/org.kde.kbibtex.desktop
+%{_kf5_iconsdir}/hicolor/*/apps/kbibtex.png
+%{_kf5_sharedir}/kbibtex/
+%{_kf5_servicesdir}/kbibtexpart.desktop
+%{_kf5_kxmlguidir}/kbibtex/
+%{_kf5_kxmlguidir}/kbibtexpart/
 %dir %{_kf5_appstreamdir}
 %{_kf5_appstreamdir}/org.kde.kbibtex.appdata.xml
-%_kf5_htmldir/*/kbibtex/
-%_kf5_sharedir/mime/packages/bibliography.xml
-%_kf5_sharedir/man/man1/kbibtex.1.gz
-%_kf5_sharedir/man/*/man1/kbibtex.1.gz
+%{_kf5_htmldir}/*/kbibtex/
+%{_kf5_sharedir}/mime/packages/bibliography.xml
+%{_kf5_sharedir}/man/man1/kbibtex.1.gz
+%{_kf5_sharedir}/man/*/man1/kbibtex.1.gz
 
+%if %{with lang}
 %files lang -f %{name}.lang
-%defattr(-,root,root)
+%endif
 
 %files devel
-%defattr(-,root,root)
-%_kf5_libdir/libkbibtex*.so
+%{_kf5_libdir}/libkbibtex*.so
 
 %changelog


Reply via email to