commit 1fdda979b78035a34663f0da787c0254d8778496
Author: Elan Ruusamäe <[email protected]>
Date: Wed May 21 14:55:47 2014 +0300
up to 0.3.8.1, gtk and qt stay at 0.3.8
recordmydesktop.spec | 51 ++++++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 21 deletions(-)
---
diff --git a/recordmydesktop.spec b/recordmydesktop.spec
index b4968d6..3745691 100644
--- a/recordmydesktop.spec
+++ b/recordmydesktop.spec
@@ -6,19 +6,22 @@
%bcond_without qt # don't build Qt frontend
%bcond_without x # don't build for X Window System frontends
-%define module recordMyDesktop
+%define ver 0.3.8.1
+%define gtk_ver 0.3.8
+%define qt_ver 0.3.8
Summary: Desktop session recorder
Summary(pl.UTF-8): Rejestrator pulpitu
Name: recordmydesktop
-Version: 0.3.8
+Version: %{ver}
+# do not decrease Release, as subpackages Version is not in sync with main
Version
Release: 6
License: GPL v2+
Group: X11/Applications
-Source0:
http://downloads.sourceforge.net/recordmydesktop/%{name}-%{version}.tar.gz
-# Source0-md5: 9834d0fa7dfb67366434cc1c3a857e9c
-Source1:
http://downloads.sourceforge.net/recordmydesktop/gtk-%{name}-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/recordmydesktop/%{name}-%{ver}.tar.gz
+# Source0-md5: 6998b165540598965499bd99d8aa0eef
+Source1:
http://downloads.sourceforge.net/recordmydesktop/gtk-%{name}-%{gtk_ver}.tar.gz
# Source1-md5: 2637b9be9801e0b2c3b6dae8f86a8b59
-Source2:
http://downloads.sourceforge.net/recordmydesktop/qt-%{name}-%{version}.tar.gz
+Source2:
http://downloads.sourceforge.net/recordmydesktop/qt-%{name}-%{qt_ver}.tar.gz
# Source2-md5: bf1525740755615ae172ae27fef68fb5
Patch0: cache_fix.patch
Patch1: x11_build_fix.patch
@@ -63,8 +66,9 @@ Vorbis do zapisu dźwięku, wykorzystując kontener Ogg.
Summary: GTK+ frontend for recordmydesktop
Summary(pl.UTF-8): Frontend do recordmydesktop oparty na GTK+
Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
-Requires: python-%{name} = %{version}-%{release}
+Version: %{gtk_ver}
+Requires: %{name} >= %{gtk_ver}
+Requires: python-%{name} >= %{gtk_ver}
%description gtk
GTK+ frontend for recordmydesktop.
@@ -76,7 +80,8 @@ Frontend do recordmydesktop oparty na GTK+.
Summary: Qt frontend for recordmydesktop
Summary(pl.UTF-8): Frontend do recordmydesktop oparty na Qt
Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
+Version: %{qt_ver}
+Requires: %{name} >= %{qt_ver}
Requires: /usr/bin/jack_lsp
Requires: python-PyQt4
@@ -90,7 +95,7 @@ Frontend do recordmydesktop oparty na Qt.
Summary: X Window System resource for recordmydesktop
Summary(pl.UTF-8): Zasoby X Window System do recordmydesktop
Group: X11/Applications
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{ver}-%{release}
%description -n python-%{name}
X Window System resource for recordmydesktop.
@@ -112,14 +117,14 @@ Zasoby X Window System do recordmydesktop.
%{__make}
%if %{with gtk}
-cd gtk-%{name}-%{version}
+cd gtk-%{name}-%{gtk_ver}
%configure
%{__make}
cd ..
%endif
%if %{with qt}
-cd qt-%{name}-%{version}
+cd qt-%{name}-%{qt_ver}
sed -i -e 's@#! /bin/sh@#!/bin/bash@' configure
%configure
%{__make}
@@ -128,22 +133,26 @@ cd ..
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} install \
+ INSTALL="%{__install} -c -p" \
DESTDIR=$RPM_BUILD_ROOT
-%py_postclean %{py_sitescriptdir}/%{module}
+%py_postclean %{py_sitescriptdir}/recordMyDesktop
%if %{with gtk}
-%{__make} -C gtk-%{name}-%{version} install \
+%{__make} -C gtk-%{name}-%{gtk_ver} install \
+ INSTALL="%{__install} -c -p" \
DESTDIR=$RPM_BUILD_ROOT
+rm -f __find.*
%find_lang gtk-recordMyDesktop
%endif
%if %{with qt}
-%{__make} -C qt-%{name}-%{version} install \
+%{__make} -C qt-%{name}-%{qt_ver} install \
+ INSTALL="%{__install} -c -p" \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf __find.*
+
+rm -f __find.*
%find_lang qt-recordMyDesktop
%py_postclean %{py_sitescriptdir}/qt_recordMyDesktop
@@ -161,13 +170,13 @@ rm -rf $RPM_BUILD_ROOT
%if %{with x}
%files -n python-%{name}
%defattr(644,root,root,755)
-%{py_sitescriptdir}/%{module}
+%{py_sitescriptdir}/recordMyDesktop
%endif
%if %{with gtk}
%files gtk -f gtk-recordMyDesktop.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gtk-%{module}
+%attr(755,root,root) %{_bindir}/gtk-recordMyDesktop
%{_desktopdir}/gtk-%{name}.desktop
%{_pixmapsdir}/gtk-%{name}.png
%endif
@@ -175,9 +184,9 @@ rm -rf $RPM_BUILD_ROOT
%if %{with qt}
%files qt -f qt-recordMyDesktop.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/qt-%{module}
+%attr(755,root,root) %{_bindir}/qt-recordMyDesktop
%{_desktopdir}/qt-%{name}.desktop
%{_pixmapsdir}/qt-%{name}*.png
%{_pixmapsdir}/*.svg
-%{py_sitescriptdir}/qt_%{module}
+%{py_sitescriptdir}/qt_recordMyDesktop
%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/recordmydesktop.git/commitdiff/1fdda979b78035a34663f0da787c0254d8778496
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
