scm-commits August 2016

scm-commits@lists.fedoraproject.org

1 participants
16798 discussions

raphgro pushed to krop (master). "bump Release"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 8ffbfe6a3030d3ce63440905a4c16f6a060f4b7e Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphgro(a)fedoraproject.org> Date: Wed, 31 Aug 2016 22:41:03 +0200 Subject: bump Release --- krop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/krop.spec b/krop.spec index 5138f31..932eb11 100644 --- a/krop.spec +++ b/krop.spec @@ -18,7 +18,7 @@ Name: krop Version: 0.4.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -122,6 +122,9 @@ update-desktop-database &> /dev/null || : %changelog +* Wed Aug 31 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.11-2 +- add license file to subpackages + * Wed Aug 31 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.11-1 - new version - migrate to python3 and split subpackage for module -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=master&id=8ffbfe6a303…

1 0

yselkowitz pushed to gucharmap (master). "Update for https://fedoraproject.org/wiki/Changes/Unicode_9.0 (..more)"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From f53f36c262f79d1231ab1dc31d95297843e72b32 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz <yselkowi(a)redhat.com> Date: Tue, 26 Jul 2016 02:20:15 -0500 Subject: Update for https://fedoraproject.org/wiki/Changes/Unicode_9.0 https://bugzilla.redhat.com/show_bug.cgi?id=1319468 --- .gitignore | 1 + gucharmap.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 131938a..dd2ec26 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ gucharmap-2.30.1.tar.bz2 /gucharmap-3.18.0.tar.xz /gucharmap-3.18.1.tar.xz /gucharmap-3.18.2.tar.xz +/gucharmap-9.0.0.tar.xz diff --git a/gucharmap.spec b/gucharmap.spec index 78c86e9..07cf822 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -2,15 +2,15 @@ %define gtk3_version 3.4.0 Name: gucharmap -Version: 3.18.2 -Release: 2%{?dist} +Version: 9.0.0 +Release: 1%{?dist} Summary: Unicode character picker and font browser License: GPLv3+ and GFDL and MIT # GPL for the source code, GFDL for the docs, MIT for Unicode data URL: http://live.gnome.org/Apps/Gucharmap #VCS: git:git://git.gnome.org/gucharmap -Source: http://download.gnome.org/sources/gucharmap/3.18/gucharmap-%{version}.tar.xz +Source: http://download.gnome.org/sources/gucharmap/9.0/gucharmap-%{version}.tar.xz BuildRequires: appdata-tools BuildRequires: glib2-devel >= %{glib2_version} @@ -21,6 +21,9 @@ BuildRequires: intltool BuildRequires: itstool BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate +BuildRequires: unicode-ucd = 9.0.0 +BuildRequires: unicode-ucd-unihan = 9.0.0 +BuildRequires: perl(Env) Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -49,7 +52,8 @@ needed to use the libgucharmap library. %build %configure --with-gtk=3.0 \ - --enable-introspection + --enable-introspection \ + --with-unicode-data=%{_datadir}/unicode/ucd make %{?_smp_mflags} @@ -115,6 +119,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Tue Jul 26 2016 Yaakov Selkowitz <yselkowi(a)redhat.com> - 9.0.0-1 +- Update for https://fedoraproject.org/wiki/Changes/Unicode_9.0 + * Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.18.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index dd5f643..ee180f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79670f9b8c9a4888f4ea439fd2e8c589 gucharmap-3.18.2.tar.xz +c8618d22c684286f551bef465eb6beda gucharmap-9.0.0.tar.xz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/gucharmap.git/commit/?h=master&id=f53f36…

1 0

raphgro pushed to krop (master). "add license file to subpackages"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 8d086dc41ff9b8ed4f2b9b27bdae67e7c5311314 Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphgro(a)fedoraproject.org> Date: Wed, 31 Aug 2016 22:39:37 +0200 Subject: add license file to subpackages --- krop.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/krop.spec b/krop.spec index dea4e98..5138f31 100644 --- a/krop.spec +++ b/krop.spec @@ -104,17 +104,18 @@ update-desktop-database &> /dev/null || : %files %doc ChangeLog README -%license LICENSE %{_bindir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %if %with python2 %files -n python2-%{name} +%license LICENSE %{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/%{name}/ %else %files -n python3-%{name} +%license LICENSE %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/%{name}/ %endif -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=master&id=8d086dc41ff…

1 0

yselkowitz uploaded gucharmap-9.0.0.tar.xz for gucharmap
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

c8618d22c684286f551bef465eb6beda gucharmap-9.0.0.tar.xz http://pkgs.fedoraproject.org/lookaside/pkgs/gucharmap/gucharmap-9.0.0.tar.…

1 0

raphgro pushed to krop (f24). "v0.4.11, python3, rhbz#1370721"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From fa23d067227411d247b5384b46aa9a1ce0a0dc61 Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphgro(a)fedoraproject.org> Date: Wed, 31 Aug 2016 22:24:44 +0200 Subject: v0.4.11, python3, rhbz#1370721 --- .gitignore | 1 + krop.spec | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------- sources | 2 +- 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c827f8c..51dbf59 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /krop-0.4.8.tar.gz /krop-0.4.9.tar.gz /krop-0.4.10.tar.gz +/krop-0.4.11.tar.gz diff --git a/krop.spec b/krop.spec index 07ad4e8..dea4e98 100644 --- a/krop.spec +++ b/krop.spec @@ -10,9 +10,15 @@ %global pkgmgr yum %endif +%if 0%{?fedora} >= 24 +%bcond_with python2 +%else +%bcond_without python2 +%endif + Name: krop -Version: 0.4.10 -Release: 2%{?dist} +Version: 0.4.11 +Release: 1%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -21,16 +27,16 @@ Source0: http://arminstraub.com/downloads/%{name}/%{name}-%{version}.tar. BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib -BuildRequires: python2-devel -BuildRequires: python-setuptools -%if 0%{?fedora} >= 24 -%global pyneeds python2-PyPDF2 PyQt4 python-poppler-qt4 +%if %with python2 +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-%{name} = %{version}-%{release} %else -%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 +BuildRequires: python3-devel +BuildRequires: python3-setuptools +Requires: python3-%{name} = %{version}-%{release} %endif -BuildRequires: %pyneeds -Requires: %pyneeds %description Krop is a simple graphical tool to crop the pages of PDF files. A unique feature @@ -38,6 +44,22 @@ of krop is its ability to automatically split pages into subpages to fit the limited screen size of devices such as eReaders. This is particularly useful, if your eReader does not support convenient scrolling. +%package -n python2-%{name} +Summary: Python2 module for %{name} +Requires: python-PyPDF2 PyQt4 python-poppler-qt4 +%{?python_provide:%python_provide python2-%{name}} + +%description -n python2-%{name} +%{summary}. + +%package -n python3-%{name} +Summary: Python3 module for %{name} +Requires: python3-PyPDF2 python3-PyQt4 python3-poppler-qt4 +%{?python_provide:%python_provide python3-%{name}} + +%description -n python3-%{name} +%{summary}. + %prep %setup -q @@ -48,16 +70,28 @@ find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ sed -i '/^#!\//, 1d' %{name}/%{name}.py %build +%if %with python2 %py2_build +%else +%py3_build +%endif %install +%if %with python2 %py2_install +%else +%py3_install +%endif desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml %check +%if %with python2 %{__python2} setup.py check +%else +%{__python3} setup.py check +%endif appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml @@ -74,11 +108,23 @@ update-desktop-database &> /dev/null || : %{_bindir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop + +%if %with python2 +%files -n python2-%{name} %{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/%{name}/ +%else +%files -n python3-%{name} +%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/%{name}/ +%endif %changelog +* Wed Aug 31 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.11-1 +- new version +- migrate to python3 and split subpackage for module + * Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.10-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… diff --git a/sources b/sources index 1e28d50..b0cc1d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f03ad32e84c3788d0ab23eebf4a5a35 krop-0.4.10.tar.gz +3385d9c534ba8fea4d0341cbb12c68da krop-0.4.11.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=f24&id=fa23d067227411…

1 0

raphgro pushed to krop (f24). "Merge branch 'master' into f22"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From b77d6259396da2c8665c7e7c82424641599c2c91 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore <dennis(a)ausil.us> Date: Wed, 17 Jun 2015 13:40:11 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- krop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/krop.spec b/krop.spec index c94104e..97cb1c8 100644 --- a/krop.spec +++ b/krop.spec @@ -1,6 +1,6 @@ Name: krop Version: 0.4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -56,6 +56,9 @@ update-desktop-database &> /dev/null || : %{python2_sitelib}/%{name}/ %changelog +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Feb 17 2015 Christopher Meng <rpm(a)cicku.me> - 0.4.7-1 - Update to 0.4.7 -- cgit v0.12 From df21868370095253eaad0ab17735cc5a8b1e9d21 Mon Sep 17 00:00:00 2001 From: Christopher Meng <rpm(a)cicku.me> Date: Tue, 21 Jul 2015 19:32:50 +0800 Subject: Update to 0.4.8 --- .gitignore | 1 + krop.spec | 43 ++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3f1b3ff..9c89fb0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /krop-0.4.5.tar.gz /krop-0.4.6.tar.gz /krop-0.4.7.tar.gz +/krop-0.4.8.tar.gz diff --git a/krop.spec b/krop.spec index 97cb1c8..2d3b46e 100644 --- a/krop.spec +++ b/krop.spec @@ -1,6 +1,18 @@ +# More convenient than %%fedora/%%rhel/%%centos. +#global osname %(cat /etc/redhat-release | sed -e 's/ release.*//') +# Sed is not safe? Awk is here. +%global osname %(cat /etc/redhat-release | awk '{sub(/ release.*/,""); print}') + +# yum still works, however I'd like to shake it off the memory. +%if (0%{?fedora} && 0%{?fedora} >= 21) || (0%{?rhel} && 0%{?rhel} >= 8) +%global pkgmgr dnf +%else +%global pkgmgr yum +%endif + Name: krop -Version: 0.4.7 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -15,27 +27,28 @@ Requires: PyQt4 Requires: python-poppler-qt4 %description -krop is a simple graphical tool to crop the pages of PDF files. It is written -in Python and relies on PyQT, python-poppler-qt4 and pyPDF for its -functionality. - -A unique feature of krop is its ability to automatically split pages into -subpages to fit the limited screen size of devices such as eReaders. This is -particularly useful, if your eReader does not support convenient scrolling. +Krop is a simple graphical tool to crop the pages of PDF files. A unique feature +of krop is its ability to automatically split pages into subpages to fit the +limited screen size of devices such as eReaders. This is particularly useful, if +your eReader does not support convenient scrolling. %prep %setup -q +# In terms of OS available on Koji. "of" is needed since Ubuntu appears as font. +find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ +-e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + %build %{__python2} setup.py build %install %{__python2} setup.py install -O1 --prefix %{_prefix} --skip-build --root %{buildroot} + desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop + sed -i '1d' %{buildroot}%{python2_sitelib}/%{name}/krop.py -mkdir -p %{buildroot}%{_datadir}/appdata -install -pm 644 %{name}.appdata.xml %{buildroot}%{_datadir}/appdata -#DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml + +DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml %check %{__python2} setup.py check @@ -48,7 +61,8 @@ update-desktop-database &> /dev/null || : update-desktop-database &> /dev/null || : %files -%doc ChangeLog LICENSE README +%doc ChangeLog README +%license LICENSE %{_bindir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop @@ -56,6 +70,9 @@ update-desktop-database &> /dev/null || : %{python2_sitelib}/%{name}/ %changelog +* Thu Jul 16 2015 Christopher Meng <rpm(a)cicku.me> - 0.4.8-1 +- Update to 0.4.8 + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 75fd9c3..2f6148e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43b7c11f09b484a5516bcaf24cd0919e krop-0.4.7.tar.gz +ed909e3852e6c31bf5c9944b08f33389 krop-0.4.8.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=f24&id=34f7a283829ad6…

1 0

raphgro pushed to krop (f24). "- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 5b652d957e18e29a56cf71b76686132846e7afa3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Tue, 19 Jul 2016 07:34:08 +0000 Subject: - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… --- krop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/krop.spec b/krop.spec index 03f719b..07ad4e8 100644 --- a/krop.spec +++ b/krop.spec @@ -12,7 +12,7 @@ Name: krop Version: 0.4.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -79,6 +79,9 @@ update-desktop-database &> /dev/null || : %changelog +* Tue Jul 19 2016 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.4.10-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Pa… + * Fri Jun 03 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.10-1 - new version -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=f24&id=5b652d957e18e2…

1 0

raphgro pushed to krop (f24). "add build conditional"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 196ba77969a3de1d740d9a8f3b5e5c9ea32e2aff Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 3 Jun 2016 11:44:19 +0200 Subject: add build conditional --- krop.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/krop.spec b/krop.spec index 2dca754..b67d1d6 100644 --- a/krop.spec +++ b/krop.spec @@ -24,7 +24,11 @@ BuildRequires: libappstream-glib BuildRequires: python2-devel BuildRequires: python-setuptools +%if 0%{?fedora} >= 24 %global pyneeds python2-PyPDF2 PyQt4 python-poppler-qt4 +%else +%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 +%endif BuildRequires: %pyneeds Requires: %pyneeds -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=f24&id=196ba77969a3de…

1 0

raphgro pushed to krop (f24). "Merge branch 'master' into f22"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 7d4369dea598d6f4527e4be6149addb1d31b907b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore <dennis(a)ausil.us> Date: Thu, 4 Feb 2016 02:26:03 +0000 Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- krop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/krop.spec b/krop.spec index 2d3b46e..c5f8942 100644 --- a/krop.spec +++ b/krop.spec @@ -12,7 +12,7 @@ Name: krop Version: 0.4.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -70,6 +70,9 @@ update-desktop-database &> /dev/null || : %{python2_sitelib}/%{name}/ %changelog +* Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jul 16 2015 Christopher Meng <rpm(a)cicku.me> - 0.4.8-1 - Update to 0.4.8 -- cgit v0.12 From 87bd241d889b3399474a53f15163895e9486e82b Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 13:05:47 +0100 Subject: v0.4.9, rhbz#1276890 --- krop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/krop.spec b/krop.spec index c5f8942..9321e9c 100644 --- a/krop.spec +++ b/krop.spec @@ -11,8 +11,8 @@ %endif Name: krop -Version: 0.4.8 -Release: 2%{?dist} +Version: 0.4.9 +Release: 1%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -70,6 +70,9 @@ update-desktop-database &> /dev/null || : %{python2_sitelib}/%{name}/ %changelog +* Fri Mar 25 2016 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org> - 0.4.9-1 +- Update to 0.4.9 (#1276890) + * Thu Feb 04 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -- cgit v0.12 From 2e28250a063812a16f55e0c58a0c2f2d54c5abff Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 13:34:19 +0100 Subject: port to pyPDF2, python3, qt5 --- krop.spec | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/krop.spec b/krop.spec index 9321e9c..5af7bc5 100644 --- a/krop.spec +++ b/krop.spec @@ -6,25 +6,40 @@ # yum still works, however I'd like to shake it off the memory. %if (0%{?fedora} && 0%{?fedora} >= 21) || (0%{?rhel} && 0%{?rhel} >= 8) %global pkgmgr dnf +%bcond_without py3 %else %global pkgmgr yum +%bcond_with py3 %endif Name: krop Version: 0.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders + License: GPLv3+ URL: http://arminstraub.com/software/krop Source0: http://arminstraub.com/downloads/%{name}/%{name}-%{version}.tar.gz + BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib + +%if %with py3 +BuildRequires: python3-devel +BuildRequires: python3-setuptools + +Requires: python3-PyPDF2 +Requires: python3-qt5 +Requires: python3-poppler-qt5 +%else BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: pyPdf + +Requires: python-PyPDF2 Requires: PyQt4 Requires: python-poppler-qt4 +%endif %description Krop is a simple graphical tool to crop the pages of PDF files. A unique feature @@ -37,39 +52,48 @@ your eReader does not support convenient scrolling. # In terms of OS available on Koji. "of" is needed since Ubuntu appears as font. find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ -e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + +# remove shebang +sed -i '1d' %{name}/%{name}.py %build -%{__python2} setup.py build +%py3_build %install -%{__python2} setup.py install -O1 --prefix %{_prefix} --skip-build --root %{buildroot} - +%py3_install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop - -sed -i '1d' %{buildroot}%{python2_sitelib}/%{name}/krop.py - DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml %check -%{__python2} setup.py check +%{__python3} setup.py check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml + %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : + %files -%doc ChangeLog README %license LICENSE +%doc ChangeLog README %{_bindir}/%{name} %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info +%if %with py3 +%{python3_sitelib}/%{name}*.egg-info +%{python3_sitelib}/%{name}/ +%else +%{python2_sitelib}/%{name}*.egg-info %{python2_sitelib}/%{name}/ +%endif + %changelog +* Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-2 +- port to PyPDF2, Python3, Qt5 + * Fri Mar 25 2016 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org> - 0.4.9-1 - Update to 0.4.9 (#1276890) -- cgit v0.12 From ab2f2485096d3f2500cca4338e5b1e36f4ad0fe9 Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 13:38:49 +0100 Subject: fix build conditional --- krop.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/krop.spec b/krop.spec index 5af7bc5..a4d52a3 100644 --- a/krop.spec +++ b/krop.spec @@ -56,10 +56,18 @@ find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ sed -i '1d' %{name}/%{name}.py %build +%if %with py3 %py3_build +%else +%py2_build +%endif %install +%if %with py3 %py3_install +%else +%py2_install +%endif desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml -- cgit v0.12 From 7f999dcfb7f59eb529c4510dd51f72821e08ef73 Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 13:43:21 +0100 Subject: import new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c89fb0..1196872 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /krop-0.4.6.tar.gz /krop-0.4.7.tar.gz /krop-0.4.8.tar.gz +/krop-0.4.9.tar.gz diff --git a/sources b/sources index 2f6148e..257fec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed909e3852e6c31bf5c9944b08f33389 krop-0.4.8.tar.gz +b6d5ee2e2f8886aeb9b530299f5bafd9 krop-0.4.9.tar.gz -- cgit v0.12 From 860c0381a4609ef61fd5ca6a521943bd8d9eae83 Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 13:52:12 +0100 Subject: fix build conditional, so in check also --- krop.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/krop.spec b/krop.spec index a4d52a3..041cd9d 100644 --- a/krop.spec +++ b/krop.spec @@ -72,7 +72,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml %check +%if %with py3 %{__python3} setup.py check +%else +%{__python2} setup.py check +%endif appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml -- cgit v0.12 From 158f8295e38976d45b85dd3468c61dbfd5b4096f Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Fri, 25 Mar 2016 18:59:15 +0100 Subject: revert to Qt4 --- krop.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/krop.spec b/krop.spec index 041cd9d..c5fb539 100644 --- a/krop.spec +++ b/krop.spec @@ -14,7 +14,7 @@ Name: krop Version: 0.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ @@ -28,18 +28,15 @@ BuildRequires: libappstream-glib %if %with py3 BuildRequires: python3-devel BuildRequires: python3-setuptools - -Requires: python3-PyPDF2 -Requires: python3-qt5 -Requires: python3-poppler-qt5 +#%%global pyneeds python3-PyPDF2 python3-qt5 python3-poppler-qt5 +%global pyneeds python3-PyPDF2 python3-qt4 python3-poppler-qt4 %else BuildRequires: python2-devel BuildRequires: python-setuptools - -Requires: python-PyPDF2 -Requires: PyQt4 -Requires: python-poppler-qt4 +%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 %endif +BuildRequires: %pyneeds +Requires: %pyneeds %description Krop is a simple graphical tool to crop the pages of PDF files. A unique feature @@ -72,11 +69,6 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml %check -%if %with py3 -%{__python3} setup.py check -%else -%{__python2} setup.py check -%endif appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml @@ -103,6 +95,11 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-3 +- revert to Qt4 because python3-poppler-qt5 is not available (yet) +- refactor python runtime needs +- simplify check, no tests for python available + * Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-2 - port to PyPDF2, Python3, Qt5 -- cgit v0.12 From 5f7633edf034b2b94ff223c2ea6fea55e6d082bc Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Sun, 24 Apr 2016 17:34:43 +0200 Subject: adjust shebang, rhbz#1321376 --- krop.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/krop.spec b/krop.spec index c5fb539..37e75b4 100644 --- a/krop.spec +++ b/krop.spec @@ -14,7 +14,7 @@ Name: krop Version: 0.4.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ @@ -49,8 +49,9 @@ your eReader does not support convenient scrolling. # In terms of OS available on Koji. "of" is needed since Ubuntu appears as font. find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ -e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + -# remove shebang -sed -i '1d' %{name}/%{name}.py +# adjust shebang +sed -i -e '/^#!\//, 1d' %{name}/%{name}.py +sed -i -e '1d;2i#!%{__python3}' bin/%{name} %build %if %with py3 @@ -95,6 +96,9 @@ update-desktop-database &> /dev/null || : %changelog +* Sun Apr 24 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-4 +- replace shebang for python3, rhbz#1321376 + * Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-3 - revert to Qt4 because python3-poppler-qt5 is not available (yet) - refactor python runtime needs -- cgit v0.12 From 56f3da1fead5948e0efca5246c5081f6c0c20544 Mon Sep 17 00:00:00 2001 From: Raphael Groner <projects.rg(a)smart.ms> Date: Sun, 24 Apr 2016 18:36:56 +0200 Subject: try again to fix desktop integration, rhbz#1321376 --- krop.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/krop.spec b/krop.spec index 37e75b4..2313ccb 100644 --- a/krop.spec +++ b/krop.spec @@ -49,9 +49,8 @@ your eReader does not support convenient scrolling. # In terms of OS available on Koji. "of" is needed since Ubuntu appears as font. find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ -e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + -# adjust shebang -sed -i -e '/^#!\//, 1d' %{name}/%{name}.py -sed -i -e '1d;2i#!%{__python3}' bin/%{name} +# remove shebang +sed -i '1d' %{name}/%{name}.py %build %if %with py3 @@ -68,6 +67,9 @@ sed -i -e '1d;2i#!%{__python3}' bin/%{name} %endif desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml +# ensure working shebang and site-packages, rhbz#1321376 +sed -i -e '1d;2i#!%{__python3}' -e 's|%{name}\.||' %{buildroot}%{_bindir}/%{name} + %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml -- cgit v0.12 From 2a57ef878c34acc20bb1b5c21d2f96feef3c0d7f Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 6 May 2016 19:14:58 +0200 Subject: revert to python2 because source is not compatible with python3, rhbz#1321376 --- krop.spec | 41 ++++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/krop.spec b/krop.spec index 9321e9c..905dc06 100644 --- a/krop.spec +++ b/krop.spec @@ -12,19 +12,21 @@ Name: krop Version: 0.4.9 -Release: 1%{?dist} +Release: 5%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop Source0: http://arminstraub.com/downloads/%{name}/%{name}-%{version}.tar.gz + BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: python2-devel BuildRequires: python-setuptools -Requires: pyPdf -Requires: PyQt4 -Requires: python-poppler-qt4 + +%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 +BuildRequires: %pyneeds +Requires: %pyneeds %description Krop is a simple graphical tool to crop the pages of PDF files. A unique feature @@ -32,34 +34,36 @@ of krop is its ability to automatically split pages into subpages to fit the limited screen size of devices such as eReaders. This is particularly useful, if your eReader does not support convenient scrolling. + %prep %setup -q # In terms of OS available on Koji. "of" is needed since Ubuntu appears as font. find . -type f -name '*.py' -exec sed -i -e 's/of ubuntu/of %{osname}/Ig' \ --e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + + -e 's|apt-get|%{pkgmgr}|g' -e 's|python-pypdf|pyPdf|g' '{}' + +# remove shebang +sed -i '/^#!\//, 1d' %{name}/%{name}.py %build -%{__python2} setup.py build +%py2_build %install -%{__python2} setup.py install -O1 --prefix %{_prefix} --skip-build --root %{buildroot} - +%py2_install desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{name}.desktop - -sed -i '1d' %{buildroot}%{python2_sitelib}/%{name}/krop.py - DESTDIR="%{buildroot}" appstream-util install %{name}.appdata.xml + %check %{__python2} setup.py check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml + %post update-desktop-database &> /dev/null || : %postun update-desktop-database &> /dev/null || : + %files %doc ChangeLog README %license LICENSE @@ -69,7 +73,22 @@ update-desktop-database &> /dev/null || : %{python2_sitelib}/%{name}-%{version}-py%{python2_version}.egg-info %{python2_sitelib}/%{name}/ + %changelog +* Fri May 06 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-5 +- revert to python2 because source is not compatible with python3, rhbz#1321376 + +* Sun Apr 24 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-4 +- replace shebang for python3, rhbz#1321376 + +* Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-3 +- revert to Qt4 because python3-poppler-qt5 is not available (yet) +- refactor python runtime needs +- simplify check, no tests for python available + +* Fri Mar 25 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-2 +- port to PyPDF2, Python3, Qt5 + * Fri Mar 25 2016 Fedora Release Monitoring <release-monitoring(a)fedoraproject.org> - 0.4.9-1 - Update to 0.4.9 (#1276890) -- cgit v0.12 From 0ed2501ff763e2b9312993a77821efbde1aecb11 Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 6 May 2016 19:23:52 +0200 Subject: reimport sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c89fb0..1196872 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /krop-0.4.6.tar.gz /krop-0.4.7.tar.gz /krop-0.4.8.tar.gz +/krop-0.4.9.tar.gz diff --git a/sources b/sources index 2f6148e..257fec4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed909e3852e6c31bf5c9944b08f33389 krop-0.4.8.tar.gz +b6d5ee2e2f8886aeb9b530299f5bafd9 krop-0.4.9.tar.gz -- cgit v0.12 From 4ef99c405521f71d9eeffd7355f238c318aabceb Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 6 May 2016 20:09:14 +0200 Subject: R: python2-pyPDF2 (instead of python-pyPDF2) --- krop.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/krop.spec b/krop.spec index 905dc06..072335d 100644 --- a/krop.spec +++ b/krop.spec @@ -12,7 +12,7 @@ Name: krop Version: 0.4.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -24,7 +24,7 @@ BuildRequires: libappstream-glib BuildRequires: python2-devel BuildRequires: python-setuptools -%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 +%global pyneeds python2-PyPDF2 PyQt4 python-poppler-qt4 BuildRequires: %pyneeds Requires: %pyneeds @@ -75,6 +75,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri May 06 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-6 +- R: python2-pyPDF2 (instead of python-pyPDF2) + * Fri May 06 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-5 - revert to python2 because source is not compatible with python3, rhbz#1321376 -- cgit v0.12 From a2e58251ecc6735ebb2521f7a5a76126b562499c Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 3 Jun 2016 11:03:16 +0200 Subject: v0.4.10, rhbz#1341376 --- .gitignore | 1 + krop.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1196872..c827f8c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /krop-0.4.7.tar.gz /krop-0.4.8.tar.gz /krop-0.4.9.tar.gz +/krop-0.4.10.tar.gz diff --git a/krop.spec b/krop.spec index 072335d..2dca754 100644 --- a/krop.spec +++ b/krop.spec @@ -11,8 +11,8 @@ %endif Name: krop -Version: 0.4.9 -Release: 6%{?dist} +Version: 0.4.10 +Release: 1%{?dist} Summary: Tool to crop PDF files with an eye towards eReaders License: GPLv3+ URL: http://arminstraub.com/software/krop @@ -75,6 +75,9 @@ update-desktop-database &> /dev/null || : %changelog +* Fri Jun 03 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.10-1 +- new version + * Fri May 06 2016 Raphael Groner <projects.rg(a)smart.ms> - 0.4.9-6 - R: python2-pyPDF2 (instead of python-pyPDF2) diff --git a/sources b/sources index 257fec4..1e28d50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b6d5ee2e2f8886aeb9b530299f5bafd9 krop-0.4.9.tar.gz +4f03ad32e84c3788d0ab23eebf4a5a35 krop-0.4.10.tar.gz -- cgit v0.12 From 196ba77969a3de1d740d9a8f3b5e5c9ea32e2aff Mon Sep 17 00:00:00 2001 From: Raphael Groner <raphro(a)fedoraproject.org> Date: Fri, 3 Jun 2016 11:44:19 +0200 Subject: add build conditional --- krop.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/krop.spec b/krop.spec index 2dca754..b67d1d6 100644 --- a/krop.spec +++ b/krop.spec @@ -24,7 +24,11 @@ BuildRequires: libappstream-glib BuildRequires: python2-devel BuildRequires: python-setuptools +%if 0%{?fedora} >= 24 %global pyneeds python2-PyPDF2 PyQt4 python-poppler-qt4 +%else +%global pyneeds python-PyPDF2 PyQt4 python-poppler-qt4 +%endif BuildRequires: %pyneeds Requires: %pyneeds -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/krop.git/commit/?h=f24&id=68713f0e00f747…

1 0

simo pushed to python-jwcrypto (f23). "Add sha512sum file"
by notifications＠fedoraproject.org 31 Aug '16

31 Aug '16

From 079773799e81352be4b57f5759d6f7c62e310e09 Mon Sep 17 00:00:00 2001 From: Simo Sorce <simo(a)redhat.com> Date: Wed, 31 Aug 2016 16:31:11 -0400 Subject: Add sha512sum file --- jwcrypto-0.3.2.tar.gz.sha512sum.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 jwcrypto-0.3.2.tar.gz.sha512sum.txt diff --git a/jwcrypto-0.3.2.tar.gz.sha512sum.txt b/jwcrypto-0.3.2.tar.gz.sha512sum.txt new file mode 100644 index 0000000..cbb045a --- /dev/null +++ b/jwcrypto-0.3.2.tar.gz.sha512sum.txt @@ -0,0 +1 @@ +3a66407a8bb590f8fdd02d87a9c2991118c7a332e4210f08e6af2b38b813ec2bc30afbcea75270d1ee0f70d0fff29fe98731270a8a457b2ca87e576ebe3046e9 jwcrypto-0.3.2.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/python-jwcrypto.git/commit/?h=f23&id=079…

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits August 2016