[gaupol/epel7] EPEL7 version reverted back to 0.19

Michael Mraka mmraka at fedoraproject.org
Fri Jul 4 08:28:24 UTC 2014


commit b38daa2a24b1807423ce9f1f893ab235e5f15772
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Fri Jul 4 10:27:03 2014 +0200

    EPEL7 version reverted back to 0.19
    
    This reverts commits
    e084196bbd24225df3736a9bf38ec430fd37c337
    667c01115c56dd04be9b010c1b910b154ea4e46d
    05a5242da3be30ecca973bbdf76ed55d4e962eb3

 .gitignore  |    1 -
 gaupol.spec |   45 ++++++++++++++++++++-------------------------
 sources     |    2 +-
 3 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f8afad..dfd2f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@ gaupol-0.17.tar.bz2
 /gaupol-0.19.tar.bz2
 /gaupol-0.19.1.tar.bz2
 /gaupol-0.19.2.tar.bz2
-/gaupol-0.25.tar.xz
diff --git a/gaupol.spec b/gaupol.spec
index 106199e..1104747 100644
--- a/gaupol.spec
+++ b/gaupol.spec
@@ -1,22 +1,20 @@
-%{!?python3_sitelib: %define python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%global __python %{__python3}
-
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:		gaupol
-Version:	0.25
-Release:	3%{?dist}
+Version:	0.19.2
+Release:	5%{?dist}
 Summary:	Subtitle editor
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://home.gna.org/gaupol
-Source0:	http://download.gna.org/gaupol/0.19/%{name}-%{version}.tar.xz
+Source0:	http://download.gna.org/gaupol/0.19/%{name}-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-BuildRequires:	python3-devel
-BuildRequires:	desktop-file-utils, gettext, doxygen, intltool
-BuildRequires:	python3-setuptools
-Requires:	python3-enchant, python3-chardet
+
+BuildRequires:	python, desktop-file-utils, gettext, doxygen, intltool
+BuildRequires:	python-setuptools-devel
+Requires:	python-enchant, python-chardet
 Requires:	aeidon
 
 %description
@@ -40,23 +38,29 @@ interface.
 sed -i -e "s/Encoding=UTF-8//" data/%{name}.desktop.in
 
 %build
-%{__python3} setup.py build
+%{__python} setup.py build
 
 %install
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 %find_lang %{name}
 desktop-file-install					\
 --dir=${RPM_BUILD_ROOT}%{_datadir}/applications		\
 --add-category AudioVideoEditing			\
 $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS README NEWS TODO
 %{_bindir}/gaupol
-%{python3_sitelib}/gaupol*
+%{python_sitelib}/gaupol*
 %{_datadir}/%{name}
-%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*/*/apps/%{name}.*
 %{_mandir}/man1/gaupol.1*
@@ -64,18 +68,9 @@ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
 %files -n aeidon
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING CREDITS README.aeidon NEWS TODO
-%{python3_sitelib}/aeidon
+%{python_sitelib}/aeidon
 
 %changelog
-* Mon Jun 30 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 0.25-3
-- Attempt to fix FTBFS by adding BR: python3-devel
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.25-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May 21 2014 Richard Hughes <rhughes at redhat.com> - 0.25-1
-- New upstream release
-
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.19.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 18e3b9d..7684f61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc53fa913a226ddbb6ff756349ca7aa5  gaupol-0.25.tar.xz
+4c319d0a1dacec6894a476b2176df939  gaupol-0.19.2.tar.bz2


More information about the scm-commits mailing list