[taskcoach] Changed license to GPLv3+

Tomas Radej tradej at fedoraproject.org
Thu Feb 7 13:02:41 UTC 2013


commit 91e7ec13a7896101c6438efba6e6bca542a21f8f
Author: Tomas Radej <tradej at redhat.com>
Date:   Thu Feb 7 13:10:52 2013 +0100

    Changed license to GPLv3+
    
    - Updated to latest upstream version
    - Did a little clean up

 .gitignore     |    1 +
 sources        |    2 +-
 taskcoach.png  |  Bin 2553 -> 0 bytes
 taskcoach.spec |   42 ++++++++++++++++++++++--------------------
 4 files changed, 24 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8653037..26cdab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 TaskCoach-1.0.3.tar.gz
 /TaskCoach-1.2.4.tar.gz
 /TaskCoach-1.2.6.tar.gz
+/TaskCoach-1.3.23.tar.gz
diff --git a/sources b/sources
index 3992c3b..35b969a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c8a64eae100ea672a210bf9cd97ede4  TaskCoach-1.2.6.tar.gz
+0120b1df7da90147f6c627eb56ae2c0a  TaskCoach-1.3.23.tar.gz
diff --git a/taskcoach.spec b/taskcoach.spec
index 6f0db87..0066ec0 100644
--- a/taskcoach.spec
+++ b/taskcoach.spec
@@ -1,21 +1,25 @@
-%define name_alternative TaskCoach
+%global name_alternative TaskCoach
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           taskcoach
-Version:        1.2.6
-Release:        4%{?dist}
+Version:        1.3.23
+Release:        1%{?dist}
 Summary:        Your friendly task manager
 Summary(pl):    Twój przyjazny menadżer zadań
 Group:          Applications/Productivity
-License:        GPLv2
+License:        GPLv3+
 URL:            http://www.taskcoach.org/
+
 Source0:        http://downloads.sourceforge.net/%{name}/%{name_alternative}-%{version}.tar.gz
-Source1:        %{name}.png
 Source2:        %{name}.desktop
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
-BuildRequires:  python-devel wxPython >= 2.8.9.1 desktop-file-utils
-Requires:       hicolor-icon-theme wxPython
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  python-devel
+BuildRequires:  wxPython >= 2.8.9.1
+Requires:       hicolor-icon-theme
+Requires:       wxPython
 
 %description
 Task Coach is a simple open source todo manager to
@@ -45,20 +49,16 @@ chmod a-x README.txt LICENSE.txt
 %{__python} make.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} make.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 mv $RPM_BUILD_ROOT%{_bindir}/%{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
 #chmod a+x $RPM_BUILD_ROOT%{python_sitelib}/%{name}lib/thirdparty/desktop.py
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -m 644 -p %{SOURCE1}   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+install -m 644 -p icons.in/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 desktop-file-install --vendor="fedora"               \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications         \
   %{SOURCE2}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -72,18 +72,20 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
-%if 0%{?fedora} >= 9
-%{python_sitelib}/%{name_alternative}-*.egg-info
-%endif
+%doc README.txt LICENSE.txt
 %{_bindir}/%{name}
-%{python_sitelib}/%{name}lib/
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
-%doc README.txt LICENSE.txt
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{python_sitelib}/%{name_alternative}-*.egg-info
+%{python_sitelib}/%{name}lib/
 %exclude %{python_sitelib}/buildlib/
 
 %changelog
+* Thu Feb 07 2013 Tomas Radej <tradej at redhat.com> - 1.3.23-1
+- Changed license to GPLv3+
+- Updated to latest upstream version
+- Did a little clean up
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list