[pyqtrailer/f12/master] Updated to latest upstream, icon and desktop file from upstream

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Oct 27 08:11:12 UTC 2010


commit fb8a3bb17e09475ac30b54a1bc8c290d3ca66d09
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Oct 27 10:05:41 2010 +0200

    Updated to latest upstream, icon and desktop file from upstream
    
    We had to start re-generating pyuic-generated files in install because
    using split build and install phase is causing problems with the build
    system for some reason. Needs more investigating...

 .gitignore          |    1 +
 pyqtrailer-icon.svg |   60 ---------------------------------------------------
 pyqtrailer.desktop  |   11 ---------
 pyqtrailer.spec     |   27 +++++++++++++++++------
 sources             |    2 +-
 5 files changed, 22 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc924bf..581380a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /pyqtrailer-0.3.6.tar.gz
+/pyqtrailer-0.4.1.tar.gz
diff --git a/pyqtrailer.spec b/pyqtrailer.spec
index de2fd7c..b6e65a7 100644
--- a/pyqtrailer.spec
+++ b/pyqtrailer.spec
@@ -3,15 +3,13 @@
 %endif
 
 Name:           pyqtrailer
-Version:        0.3.6
-Release:        2%{?dist}
+Version:        0.4.1
+Release:        1%{?dist}
 Summary:        PyQt4 application to download trailers from apple.com
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://github.com/sochotnicky/%{name}
 Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
-Source2:        %{name}-icon.svg
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -21,8 +19,9 @@ BuildRequires:  python-dateutil
 BuildRequires:  PyQt4-devel
 
 Requires:       python-dateutil
-Requires:       pytrailer
+Requires:       pytrailer >= 0.4
 Requires:       PyQt4
+# pyqtrailer supports python3 but we have no python3-dateutil in Fedoras
 
 %description
 This application is able to download trailers from apple.com/trailers
@@ -42,12 +41,22 @@ It shows descriptions, posters, and other movie information.
 rm -rf %{buildroot}
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+# Unfortunately setup.py doesn't realize new files have been generated
+# during build so we have rebuild them here
+pushd %{buildroot}%{python_sitelib}/pyqtrailer/qtcustom/
+for ui in about.ui settings.ui;do
+    out=${ui/.ui/_ui.py}
+    pyuic4 -o $out $ui
+done
+popd
+
+
 desktop-file-install \
     --dir=%{buildroot}%{_datadir}/applications \
-     %{SOURCE1}
+     xdg/%{name}.desktop
 
 install -dm 755 %{buildroot}%{_datadir}/pixmaps
-install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.svg
+install -m 644 xdg/%{name}.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
 
 %clean
 rm -rf %{buildroot}
@@ -63,6 +72,10 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Oct 26 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.4.1-1
+- Updated to latest upstream
+- Using icon and desktop file from upstream
+
 * Mon Oct 18 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.3.6-2
 - Added desktop entry and icon
 
diff --git a/sources b/sources
index c850ea5..89d6b07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72801e8a880ed12a30510f5edcf5b107  pyqtrailer-0.3.6.tar.gz
+1acf9de2a35e54dcb505283c1754563b  pyqtrailer-0.4.1.tar.gz


More information about the scm-commits mailing list