[packages/xournal] upgraded to 0.4.8.2016

gotar gotar at pld-linux.org
Fri Jun 21 09:27:56 CEST 2019


commit 9e9396a958038e101b0e39cae930250222322427
Author: Tomasz Pala <gotar at polanet.pl>
Date:   Fri Jun 21 09:27:28 2019 +0200

    upgraded to 0.4.8.2016

 xournal-zlib.patch |  6 +++---
 xournal.spec       | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/xournal.spec b/xournal.spec
index c7d55b5..0e14b72 100644
--- a/xournal.spec
+++ b/xournal.spec
@@ -1,22 +1,23 @@
 Summary:	Xournal - application for notetaking, sketching, keeping a journal using a stylus
 Summary(pl.UTF-8):	Xournal - aplikacja do tworzenia notatek, szkicowania i prowadzenia dziennika pisakiem
 Name:		xournal
-Version:	0.4.5
-Release:	4
-License:	GPL
+Version:	0.4.8.2016
+Release:	1
+License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
-# Source0-md5:	795e4396ded2b67766eb2926be1fb4a9
+# Source0-md5:	a594f475d9b93fbca0aac43d47c2de22
 Patch0:		%{name}-zlib.patch
 Patch1:		%{name}-poppler-api.patch
 URL:		http://xournal.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-tools
-BuildRequires:	gtk+2-devel >= 2:2.4
+BuildRequires:	gtk+2-devel >= 2:2.10
 BuildRequires:	libgnomecanvas-devel >= 2.4
+BuildRequires:	pango-devel >= 1.0
 BuildRequires:	pkgconfig
-BuildRequires:	poppler-glib-devel
+BuildRequires:	poppler-glib-devel >= 0.5.4
 BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -33,7 +34,7 @@ Journal czy innych alternatyw takich jak Jarnal i Gournal.
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
+#%%patch1 -p0
 
 %build
 %{__aclocal}
@@ -61,6 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README src/TODO
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_desktopdir}/%{name}.desktop
diff --git a/xournal-zlib.patch b/xournal-zlib.patch
index 59723e3..2fa9e97 100644
--- a/xournal-zlib.patch
+++ b/xournal-zlib.patch
@@ -1,11 +1,11 @@
 --- configure.in~	2009-10-02 07:42:02.000000000 +0100
 +++ configure.in	2010-07-31 12:02:39.862582539 +0100
-@@ -11,7 +11,7 @@
+@@ -13,7 +13,7 @@
  AC_PROG_RANLIB
  AC_HEADER_STDC
  
--pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4"
-+pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 zlib"
+-pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0"
++pkg_modules="gtk+-2.0 >= 2.10.0 libgnomecanvas-2.0 >= 2.4.0 poppler-glib >= 0.5.4 pangoft2 >= 1.0 zlib"
  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
  AC_SUBST(PACKAGE_CFLAGS)
  AC_SUBST(PACKAGE_LIBS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xournal.git/commitdiff/9e9396a958038e101b0e39cae930250222322427



More information about the pld-cvs-commit mailing list