Accepting request 910100 from home:badshah400:branches:X11:Utilities
* Update to version 1.1.0. * Drop xournalpp-fix-desktop-categories.patch: No longer needed. * Force GCC 9 as the compiler for openSUSE Leap 15.x as builds require that as a minimum for proper c++17 support. * Drop update-icon-cache.sh removal, no longer installed by upstream. * Update BuildRequires with upstream. OBS-URL: https://build.opensuse.org/request/show/910100 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xournalpp?expand=0&rev=29
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
9a9dae8677
commit
98414f1281
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1abf9925f11f0944c8142194be3e72541e230afa83490b074f5c6e613b0e2a02
|
||||
size 14895705
|
||||
3
xournalpp-1.1.0.tar.gz
Normal file
3
xournalpp-1.1.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31b99282bcd1d829f05f1c9ccd07c5d599acc0e69725d135cdc97e1dcaf2baee
|
||||
size 15037204
|
||||
@ -1,10 +0,0 @@
|
||||
Index: xournalpp-1.99.20190821.ccc9dbc6/desktop/com.github.xournalpp.xournalpp.desktop
|
||||
===================================================================
|
||||
--- xournalpp-1.99.20190821.ccc9dbc6.orig/desktop/com.github.xournalpp.xournalpp.desktop
|
||||
+++ xournalpp-1.99.20190821.ccc9dbc6/desktop/com.github.xournalpp.xournalpp.desktop
|
||||
@@ -24,4 +24,4 @@ Terminal=false
|
||||
StartupNotify=true
|
||||
MimeType=application/x-xoj;application/x-xojpp;application/x-xopp;application/x-xopt;application/pdf;
|
||||
Icon=com.github.xournalpp.xournalpp
|
||||
-Categories=Office;GNOME;GTK;
|
||||
+Categories=Graphics;2DGraphics;GTK;GNOME;
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 4 09:13:48 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Update to version 1.1.0:
|
||||
* Major release with many changes, see
|
||||
https://github.com/xournalpp/xournalpp/blob/1.1.0/CHANGELOG.md
|
||||
- Drop xournalpp-fix-desktop-categories.patch: No longer needed.
|
||||
- Force GCC 9 as the compiler for openSUSE Leap 15.x as builds
|
||||
require that as a minimum for proper c++17 support.
|
||||
- Drop update-icon-cache.sh removal, no longer installed by
|
||||
upstream.
|
||||
- Update BuildRequires with upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 16 21:22:12 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
@ -17,32 +17,36 @@
|
||||
|
||||
|
||||
Name: xournalpp
|
||||
Version: 1.0.20
|
||||
Version: 1.1.0
|
||||
Release: 0
|
||||
Summary: Notetaking software designed around a tablet
|
||||
License: GPL-2.0-or-later
|
||||
Group: Productivity/Office/Other
|
||||
URL: https://github.com/xournalpp/xournalpp
|
||||
Source0: https://github.com/xournalpp/xournalpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM xournalpp-fix-desktop-categories.patch badshah400@gmail.com -- Fix desktop categories with additional keywords to prevent "No sufficient Category definition" error from brp-desktop.
|
||||
Patch0: xournalpp-fix-desktop-categories.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: texlive-latex-bin
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gthread-2.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(libzip)
|
||||
BuildRequires: pkgconfig(lua) >= 5.3
|
||||
BuildRequires: pkgconfig(lua)
|
||||
BuildRequires: pkgconfig(poppler-glib)
|
||||
BuildRequires: pkgconfig(portaudiocpp)
|
||||
BuildRequires: pkgconfig(sndfile)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
Recommends: tex(standalone.tex)
|
||||
%if 0%{?suse_version} < 1550
|
||||
BuildRequires: gcc9-c++
|
||||
%else
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
|
||||
%description
|
||||
Xournal++ is a hand note taking software.
|
||||
@ -51,18 +55,18 @@ It supports pen input, e.g. Wacom tablets.
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%cmake
|
||||
%cmake -DENABLE_MATHTEX=ON \
|
||||
%if 0%{?suse_version} < 1550
|
||||
-DCMAKE_CXX_COMPILER="%{_bindir}/g++-9" \
|
||||
%endif
|
||||
%{nil}
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
# REMOVE UNNECESSARY SCRIPTS update-icon-cache IS TAKEN CARE OF BY RPM FILE TRIGGERS
|
||||
rm %{buildroot}%{_datadir}/%{name}/ui/*/hicolor/update-icon-cache.sh
|
||||
|
||||
%find_lang xournalpp %{no_lang_C}
|
||||
|
||||
%fdupes %{buildroot}%{_datadir}
|
||||
@ -70,20 +74,19 @@ rm %{buildroot}%{_datadir}/%{name}/ui/*/hicolor/update-icon-cache.sh
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc AUTHORS README.md
|
||||
%{_bindir}/xournal-thumbnailer
|
||||
%{_bindir}/xournalpp-thumbnailer
|
||||
%{_bindir}/xournalpp
|
||||
%{_datadir}/applications/*.xournalpp.desktop
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
|
||||
%{_datadir}/mime/packages/*.xml
|
||||
%dir %{_datadir}/metainfo
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
%{_datadir}/metainfo/*.appdata.xml
|
||||
%{_datadir}/mime/packages/*.xml
|
||||
%dir %{_datadir}/mimelnk
|
||||
%dir %{_datadir}/mimelnk/application
|
||||
%{_datadir}/mimelnk/application/*.desktop
|
||||
%{_datadir}/xournalpp/
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
%dir %{_datadir}/thumbnailers
|
||||
%{_datadir}/thumbnailers/*.thumbnailer
|
||||
%{_datadir}/xournalpp/
|
||||
|
||||
%files lang -f xournalpp.lang
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user