commit bedad4d71a6ad765dcb70f52ffbebd58e7e54b51
Author: Jacek Konieczny <[email protected]>
Date: Sat Apr 16 18:56:19 2016 +0200
Version: 4.2.3
gramps-icon_path.patch | 16 +++++++++++++---
gramps.spec | 49 ++++++++++++++++++-------------------------------
python-opt2.patch | 10 ++++++++++
3 files changed, 41 insertions(+), 34 deletions(-)
---
diff --git a/gramps.spec b/gramps.spec
index e8d7b83..f6b67cc 100644
--- a/gramps.spec
+++ b/gramps.spec
@@ -1,34 +1,30 @@
Summary: Genealogical Research and Analysis Management Programming System
Summary(pl.UTF-8): System programowania do zarządzania badaniami i analizą
genealogiczną
Name: gramps
-Version: 4.0.2
-Release: 2
+Version: 4.2.3
+Release: 1
License: GPL v2
Group: Applications/Science
Source0:
http://downloads.sourceforge.net/gramps/%{name}-%{version}.tar.gz
-# Source0-md5: 41d9ae797c2eb2da42474aca3cccb6b3
+# Source0-md5: 84dd51a8da697fb494d2c22fd07a360d
Patch0: %{name}-icon_path.patch
+Patch1: python-opt2.patch
URL: http://gramps-project.org/
-BuildRequires: GConf2-devel
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: gettext-tools
-BuildRequires: gnome-doc-utils
-BuildRequires: gtk+2-devel >= 2:2.8.0
BuildRequires: intltool
-BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.5
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-setuptools
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: scrollkeeper >= 0.3.5
+BuildRequires: rpmbuild(macros) >= 1.713
%pyrequires_eq python-modules
Requires(post,postun): desktop-file-utils
-Requires(post,postun): scrollkeeper
-Requires(post,preun): GConf2
Requires: hicolor-icon-theme
-Requires: python-gnome-ui >= 2.12.2-2
+Requires: python3-bsddb3
+Requires: python3-pygobject3 >= 3.12
+Requires: python3-pyicu
+Requires: python3-pycairo
+Requires: xdg-utils
Suggests: graphviz
-Suggests: python-ReportLab
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,30 +41,23 @@ system wtyczek w Pythonie.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
-%{__python} setup.py build
+%py3_build
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py \
- install \
- --root=$RPM_BUILD_ROOT \
- --optimize=2
+%py3_install
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
-install images/gramps.png $RPM_BUILD_ROOT%{_pixmapsdir}
+echo -n "%{_datadir}" >
$RPM_BUILD_ROOT%{py3_sitescriptdir}/gramps/gen/utils/resource-path
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mime-info
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
-%py_postclean
-
%find_lang gramps
%clean
@@ -76,11 +65,9 @@ rm -rf $RPM_BUILD_ROOT
%post
%update_desktop_database_post
-%scrollkeeper_update_post
%postun
%update_desktop_database_postun
-%scrollkeeper_update_postun
%files -f gramps.lang
%defattr(644,root,root,755)
@@ -92,8 +79,8 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gramps/css
%{_datadir}/gramps/images
-%{py_sitescriptdir}/gramps
-%{py_sitescriptdir}/gramps-*.egg-info
+%{py3_sitescriptdir}/gramps
+%{py3_sitescriptdir}/gramps-*.egg-info
%{_desktopdir}/*.desktop
%{_iconsdir}/hicolor/*/mimetypes/*
diff --git a/gramps-icon_path.patch b/gramps-icon_path.patch
index 9fe0cc1..c0a3c42 100644
--- a/gramps-icon_path.patch
+++ b/gramps-icon_path.patch
@@ -1,6 +1,16 @@
---- gramps-4.0.2/setup.py~ 2013-11-08 10:26:40.000000000 +0100
-+++ gramps-4.0.2/setup.py 2013-12-04 17:18:23.232488702 +0100
-@@ -415,8 +415,8 @@
+diff -dur -x '*.orig' gramps-4.2.3.orig/setup.py gramps-4.2.3/setup.py
+--- gramps-4.2.3.orig/setup.py 2016-04-10 17:59:24.000000000 +0200
++++ gramps-4.2.3/setup.py 2016-04-16 17:57:07.219083736 +0200
+@@ -407,7 +407,7 @@
+ #
+ #-------------------------------------------------------------------------
+ data_files_core = [('share/mime-info', ['data/gramps.mime']),
+- ('share/icons', ['images/gramps.png'])]
++ ('share/pixmaps', ['images/gramps.png'])]
+ DOC_FILES = ['AUTHORS', 'COPYING', 'FAQ', 'INSTALL', 'LICENSE', 'NEWS',
+ 'README', 'TODO']
+ GEDCOM_FILES = glob.glob(os.path.join('example', 'gedcom', '*.*'))
+@@ -429,8 +429,8 @@
PNG_FILES = glob.glob(os.path.join('data', '*.png'))
SVG_FILES = glob.glob(os.path.join('data', '*.svg'))
diff --git a/python-opt2.patch b/python-opt2.patch
new file mode 100644
index 0000000..29bca35
--- /dev/null
+++ b/python-opt2.patch
@@ -0,0 +1,10 @@
+-O uses opt-1.pyc files, not included in our RPMs
+
+diff -dur gramps-4.2.3.orig/scripts/gramps gramps-4.2.3/scripts/gramps
+--- gramps-4.2.3.orig/scripts/gramps 2016-01-06 18:08:30.000000000 +0100
++++ gramps-4.2.3/scripts/gramps 2016-04-16 18:21:01.332394712 +0200
+@@ -1,3 +1,3 @@
+-#!/usr/bin/env python -O
++#!/usr/bin/env python -OO
+ import gramps.grampsapp as app
+ app.main()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gramps.git/commitdiff/bedad4d71a6ad765dcb70f52ffbebd58e7e54b51
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
