From 816dc934a809c76ae35015868d991480170dc814 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Apr 15 2015 16:22:06 +0000 Subject: Update to 3.0.0 release --- diff --git a/.gitignore b/.gitignore index 81d1f09..7686dec 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ system-config-language-1.3.4.tar.bz2 /system-config-language-2.4.0.tar.xz /system-config-language-2.4.1.tar.xz /system-config-language-2.4.2.tar.xz +/system-config-language-3.0.0.tar.xz diff --git a/sources b/sources index c5ba002..1053913 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb49dde9eadf87be35ca6da3572c0739 system-config-language-2.4.2.tar.xz +14f10a71f78c0ccd8830d4c727f70aa3 system-config-language-3.0.0.tar.xz diff --git a/system-config-language.spec b/system-config-language.spec index fc01290..ee5a7f5 100644 --- a/system-config-language.spec +++ b/system-config-language.spec @@ -1,39 +1,85 @@ -Summary: A graphical interface for modifying the system language -Name: system-config-language -Version: 2.4.2 -Release: 2%{?dist} -URL: https://fedorahosted.org/system-config-language/ -Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.xz -License: GPLv2+ - -BuildArch: noarch +%global with_python3 0 + +Summary: A graphical interface for modifying the system language +Name: system-config-language +Version: 3.0.0 +Release: 1%{?dist} +URL: https://fedorahosted.org/system-config-language/ +Source0: https://fedorahosted.org/releases/s/y/system-config-language/%{name}-%{version}.tar.xz +License: GPLv2+ + +BuildArch: noarch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool BuildRequires: python2-devel -Requires: pygtk2 -Requires: yum -Requires: gtk3 -Requires: polkit -Requires: hicolor-icon-theme -Requires: yum-langpacks +Requires: pygtk2 +Requires: dnf +Requires: gtk3 +Requires: polkit +Requires: hicolor-icon-theme +Requires: dnf-langpacks %description system-config-language is a graphical user interface that allows the user to change the default language of the system. -%prep -%setup -q +%if 0%{?with_python3} +%package -n python3-system-config-language +Summary: A graphical interface for modifying the system language +License: GPLv2+ + +BuildArch: noarch +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool +BuildRequires: python2-devel + +Requires: pygtk2 +Requires: dnf +Requires: gtk3 +Requires: polkit +Requires: hicolor-icon-theme +Requires: python3-dnf-langpacks -sed -i 's/^exec //g' src/system-config-language +%description -n python3-system-config-language +system-config-language is a graphical user interface that +allows the user to change the default language of the system. +%endif +%prep +%setup -qc +mv %{name}-%{version} python2 +pushd python2 +# copy common doc files to top dir +cp -pr COPYING NEWS ChangeLog ../ +popd + +%if 0%{?with_python3} +cp -a python2 python3 +find python3 -name '*.py' | xargs sed -i '1s|^#!/usr/bin/python|#!%{__python3}|' +%endif # with_python3 %build + +find python2 -name '*.py' | xargs sed -i '1s|^#!/usr/bin/python|#!%{__python2}|' + +pushd python2 %configure make %{?_smp_mflags} +popd %install +pushd python2 +make install DESTDIR=%{buildroot} INSTALL="install -p" +popd + +%if 0%{?with_python3} +pushd python3 +%configure PYTHON=python3 make install DESTDIR=%{buildroot} INSTALL="install -p" +popd +%endif desktop-file-install --vendor system --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -58,15 +104,33 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang -%doc COPYING +%license COPYING +%doc NEWS ChangeLog %{_bindir}/system-config-language %{_datadir}/system-config-language %{_datadir}/applications/system-config-language.desktop %{_datadir}/icons/hicolor/48x48/apps/system-config-language.png %{_mandir}/man1/system-config-language.1.gz +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/polkit-1/actions/org.fedoraproject.config.language.policy +%if 0%{?with_python3} +%files -n python3-system-config-language -f %{name}.lang +%license COPYING +%doc NEWS ChangeLog +%{_bindir}/system-config-language +%{_datadir}/system-config-language +%{_datadir}/applications/system-config-language.desktop +%{_datadir}/icons/hicolor/48x48/apps/system-config-language.png +%{_mandir}/man1/system-config-language.1.gz +%{_datadir}/appdata/%{name}.appdata.xml +%{_datadir}/polkit-1/actions/org.fedoraproject.config.language.policy +%endif + %changelog +* Wed Apr 15 2015 Parag Nemade - 3.0.0-1 +- Update to 3.0.0 release + * Wed Apr 08 2015 Parag Nemade - 2.4.2-1 - Update to 2.4.2 release