Update to 0.8.1

This commit is contained in:
Robin Lee 2018-07-15 14:54:15 +08:00
parent 2dc7321aab
commit fd77748837
4 changed files with 39 additions and 76 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ kbibtex-0.2.2.tar.bz2
/kbibtex-0.6.tar.xz
/kbibtex-0.6.2.tar.xz
/kbibtex-0.7.tar.gz
/kbibtex-0.8.1.tar.gz

View File

@ -1,25 +0,0 @@
From d6a2a01b56f61a7736a5dae1f8c92becb7fbd2be Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Thu, 5 Apr 2018 22:26:34 +0200
Subject: [PATCH] Fix build with ICU 61
Starting from ICU 61, UnicodeString type needs to be properly namespaced
Differential Revision: https://phabricator.kde.org/D11883
---
src/io/encoderlatex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/io/encoderlatex.cpp b/src/io/encoderlatex.cpp
index 2d666970..2ba30ab0 100644
--- a/src/io/encoderlatex.cpp
+++ b/src/io/encoderlatex.cpp
@@ -1099,7 +1099,7 @@ QString EncoderLaTeX::convertToPlainAscii(const QString &ninput) const
for (int i = 0; i < ninputLen; ++i)
uChars[i] = ninput.at(i).unicode();
/// Create an ICU-specific unicode string
- UnicodeString uString = UnicodeString(uChars, ninputLen);
+ icu::UnicodeString uString = icu::UnicodeString(uChars, ninputLen);
/// Perform the actual transliteration, modifying Unicode string
m_trans->transliterate(uString);
/// Create regular C++ string from Unicode string

View File

@ -1,28 +1,34 @@
Name: kbibtex
Version: 0.7
Release: 4%{?dist}
Version: 0.8.1
Release: 1%{?dist}
Summary: A BibTeX editor for KDE
Group: Applications/Editors
License: GPLv2+
URL: https://userbase.kde.org/KBibTeX
Source0: https://github.com/KDE/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# Fix build with ICU 61, backported from upstream
Patch0: d6a2a01b56f61a7736a5dae1f8c92becb7fbd2be.patch
BuildRequires: cmake kdelibs4-devel libxslt-devel desktop-file-utils gettext-devel
BuildRequires: pkgconfig(QtWebKit)
BuildRequires: poppler-qt4-devel
BuildRequires: libqxt-devel
BuildRequires: cmake qt5-qtbase-devel desktop-file-utils gettext-devel
BuildRequires: cmake(Qt5XmlPatterns)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5ItemViews)
BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5Wallet)
BuildRequires: cmake(KF5Crash)
BuildRequires: extra-cmake-modules
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: poppler-qt5-devel
BuildRequires: qca-qt5-devel
BuildRequires: libicu-devel
%if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: qca2-devel
%else
BuildRequires: qca-devel
%endif
Requires: okular-part%{_isa}
Requires: %{name}-libs%{_isa} = %{version}-%{release}
%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
BuildRequires: qoauth-qt5-devel
%description
The program KBibTeX is a bibliography editor for KDE. Its main purpose is to
@ -48,13 +54,12 @@ developing programs using KBibTeX libraries.
%prep
%setup -q
%patch0 -p1
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
%{cmake_kf5} ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@ -64,42 +69,22 @@ make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
%check
desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/%{name}.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_kf5_datadir}/applications/*.desktop
%post
/sbin/ldconfig
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null ||:
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
update-desktop-database -q &> /dev/null ||:
touch --no-create %{_datadir}/mime/packages &> /dev/null || :
update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
fi
%files
%doc README ChangeLog
%{_kde4_bindir}/%{name}
%{_kde4_libdir}/kde4/%{name}part.so*
%{_kde4_datadir}/appdata/%{name}.appdata.xml
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_appsdir}/%{name}/
%{_kde4_appsdir}/%{name}part/
%{_kde4_datadir}/kde4/services/%{name}part.desktop
%{_kde4_configdir}/%{name}rc
%{_qt5_settingsdir}/%{name}rc
%{_kf5_bindir}/%{name}
%{_qt5_plugindir}/%{name}part.so*
%{_kf5_datadir}/applications/*%{name}.desktop
%{_kf5_datadir}/kservices5/%{name}part.desktop
%{_kf5_datadir}/kxmlgui5/*
%{_kf5_datadir}/%{name}/
%{_datadir}/metainfo/*
%{_datadir}/mime/packages/bibliography.xml
%{_kde4_iconsdir}/hicolor/*/apps/%{name}.*
%{_kde4_docdir}/HTML/*/%{name}
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_kf5_docdir}/HTML/*/%{name}
%{_mandir}/man1/%{name}*
%files libs
@ -108,10 +93,12 @@ fi
%files devel
%{_libdir}/lib%{name}*.so
%{_kde4_includedir}/%{name}/
%changelog
* Sun Jul 15 2018 Robin Lee <cheeselee@fedoraproject.org> - 0.8.1-1
- Update to 0.8.1
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (kbibtex-0.7.tar.gz) = dcab39e8852f39de6a2b2c7e80bb56873a29f66253e6d3e6afe72727f724765de87296b33ce4c608aefc752a200b59996cf5bfb0b43a1412de0419207f7b7145
SHA512 (kbibtex-0.8.1.tar.gz) = 5f4da5f8c5d9c233e014f5427f28358872c0b2119849b65e17ec90332674f69c1eef3de4a2dcf17e3227e7123285aeb10d2b279f3cdaf597aeb0d670b4d717bb