mcepl pushed to youtube-dl (f20). "Merge branch 'master' into el6 (..more)"

Fri Jun 5 09:30:46 UTC 2015

From a6a59efb2819a4e8fad5dcd86f5a7decc2d83158 Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm at cicku.me>
Date: Tue, 14 May 2013 11:55:54 +0800
Subject: New version

diff --git a/sources b/sources
index 96f9c65..4d0e9c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f525dfa558c06b4360cc38aaadf0ae7a  youtube-dl-2013.05.07.tar.gz
+139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 48a8313..1761721 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2013.05.07
+Version:        2013.05.14
 Release:        1%{?dist}
 Summary:        Small command-line program to download videos from YouTube
 Group:          Applications/Multimedia
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Tue May 14 2013 Christopher Meng <rpm at cicku.me> - 2013.05.14-1
+- Update to new release
+
 * Wed May 08 2013 Christopher Meng <rpm at cicku.me> - 2013.05.07-1
 - Update to new release
 
-- 
cgit v0.10.2


From c3bfaae81d8b6747a00d055d966e1952d8a350a0 Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm at cicku.me>
Date: Mon, 17 Jun 2013 12:00:49 +0800
Subject: New version.


diff --git a/.gitignore b/.gitignore
index c7198ea..2f6ddb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /youtube-dl-2013.01.13.tar.gz
 /youtube-dl-2013.04.18.tar.gz
 /youtube-dl-2013.05.07.tar.gz
+/youtube-dl-2013.05.23.tar.gz
diff --git a/sources b/sources
index 4d0e9c9..bdb6273 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
+6cb4ee904456d102d4f3edb68272ca50  youtube-dl-2013.05.23.tar.gz
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 1761721..75a61d8 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,21 +1,19 @@
 Name:           youtube-dl
-Version:        2013.05.14
+Version:        2013.05.23
 Release:        1%{?dist}
-Summary:        Small command-line program to download videos from YouTube
-Group:          Applications/Multimedia
+Summary:        A small command-line program to download videos from YouTube.com and other sites
 License:        Public Domain
 URL:            http://youtube-dl.org
 Source0:        http://youtube-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       python >= 2.6
 # Used in Makefile to generate youtube-dl
 BuildRequires:  zip
 # Used to generate manpage
 BuildRequires:  pandoc
-BuildRequires:  python >= 2.6
+BuildRequires:  python
+Requires:       python
 
 %description
 Small command-line program to download videos from YouTube.
@@ -28,16 +26,11 @@ gzip -dc %{SOURCE0} | tar --strip-components=1 -xvvf -
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR="$RPM_BUILD_ROOT" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
+mkdir -p %{buildroot}%{_sysconfdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}
 
 %files
-%defattr(-,root,root,-)
 %doc CHANGELOG LICENSE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
@@ -45,35 +38,38 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Mon Jun 17 2013 Christopher Meng <rpm at cicku.me> - 2013.05.23-1
+- Update to new release and cleanup the spec.
+
 * Tue May 14 2013 Christopher Meng <rpm at cicku.me> - 2013.05.14-1
-- Update to new release
+- Update to new release.
 
 * Wed May 08 2013 Christopher Meng <rpm at cicku.me> - 2013.05.07-1
-- Update to new release
+- Update to new release.
 
 * Thu Apr 18 2013 Till Maas <opensource at till.name> - 2013.04.18-1
-- Update to new release
+- Update to new release.
 
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2013.01.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
 * Tue Jan 15 2013 Till Maas <opensource at till.name> - 2013.01.13-1
-- Update to new release
+- Update to new release.
 
 * Sun Jan 06 2013 Matěj Cepl <mcepl at redhat.com> - 2013.01.02-1
-- Update to new release (fix #880270)
+- Update to new release (fix #880270).
 
 * Tue Oct 23 2012 Till Maas <opensource at till.name> - 2012.10.09-1
-- Update to new release
-- Update BR: add pandoc
-- install make target
+- Update to new release.
+- Update BR: add pandoc.
+- install make target.
 
 * Tue Oct 02 2012 Till Maas <opensource at till.name> - 2012.09.27-3
-- Add BR: python >= 2.6
+- Add BR: python >= 2.6.
 
 * Tue Oct 02 2012 Till Maas <opensource at till.name> - 2012.09.27-2
-- Use noreplace for config file
-- Add BR: zip
+- Use noreplace for config file.
+- Add BR: zip.
 
 * Tue Oct  2 2012 Tim Landscheidt <tim at tim-landscheidt.de> - 2012.09.27-1
 - Bump Python requirement to 2.6.
@@ -83,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Sat Apr 21 2012 Till Maas <opensource at till.name> - 2012.02.27-1
-- Update to new release
+- Update to new release.
 
 * Thu Jan 26 2012 Till Maas <opensource at till.name> - 2011.12.08-3
 - Provide --prefer-free-formats in %%{_sysconfdir}/%%{name}.conf (RH #757577)
@@ -93,60 +89,60 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Sat Dec 10 2011 Till Maas <opensource at till.name> - 2011.12.08-1
-- Update to new release
+- Update to new release.
 
 * Thu Dec 08 2011 Till Maas <opensource at till.name> - 2011.11.23-1
-- Update to new release (fixed Red Hat Bug #758679)
+- Update to new release (fixed Red Hat Bug #758679).
 
 * Fri Oct 21 2011 Till Maas <opensource at till.name> - 2011.10.19-1
-- Update to latest release
+- Update to latest release.
 
 * Thu Aug 04 2011 Till Maas <opensource at till.name> - 2011.08.04-1
 - Update to latest release to adjust to backend changes (Red Hat Bug
-  #728378)
+  #728378).
 
 * Fri May 13 2011 Till Maas <opensource at till.name> - 2011.03.29-1
-- Update to latest release
+- Update to latest release.
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.01.30-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Mon Jan 31 2011 Till Maas <opensource at till.name> - 2010.01.30-1
-- Update to latest release
+- Update to latest release.
 
 * Sun Dec 12 2010 Till Maas <opensource at till.name> - 2010.12.09-1
-- Update to latest release to adjust with youtube changes
+- Update to latest release to adjust with youtube changes.
 
 * Sat Nov 06 2010 Till Maas <opensource at till.name> - 2010.10.24-1
-- Update to latest release
-- Adjust to new upstream location at github instead of bitbucket
-- add -p to install
+- Update to latest release.
+- Adjust to new upstream location at github instead of bitbucket.
+- add -p to install.
 - remove index.html
 
 * Thu Oct 07 2010 Till Maas <opensource at till.name> - 2010.10.03-1
-- Update to latest release
+- Update to latest release.
 
 * Thu Aug 05 2010 Till Maas <opensource at till.name> - 2010.08.04-1
-- Update to latest release
+- Update to latest release.
 
 * Fri Jul 23 2010 Till Maas <opensource at till.name> - 2010.07.22-1
-- Update to latest release
+- Update to latest release.
 
 * Thu Jul 15 2010 Till Maas <opensource at till.name> - 2010.07.14-1
-- Update to latest release
+- Update to latest release.
 
 * Mon Jun 07 2010 Till Maas <opensource at till.name> - 2010.06.06-1
-- Update to latest release
+- Update to latest release.
 
 * Thu Apr 29 2010 Till Maas <opensource at till.name> - 2010.04.04-1
-- Update to latest release to fix some download issues RH #582372
+- Update to latest release to fix some download issues RH #582372.
 
 * Fri Oct 09 2009 Rafał Psota <rafalzaq at gmail.com> - 2009.09.13-2
-- Small fix in %%prep
+- Small fix in %%prep.
 
 * Sun Sep 27 2009 Rafał Psota <rafalzaq at gmail.com> - 2009.09.13-1
-- Update to 2009.09.13
-- License change to Public Domain
+- Update to 2009.09.13.
+- License change to Public Domain.
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2008.01.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -173,4 +169,4 @@ rm -rf $RPM_BUILD_ROOT
 - Update to v2007.10.12, correct license and update summary.
 
 * Sun Dec 9 2007 Krzysztof Kurzawski <kurzawax at gmail.com> 1-1
-- First release
+- First release.
-- 
cgit v0.10.2


From a4a3049971dcacf9c0365a15bdded295ed4dc64c Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm at cicku.me>
Date: Wed, 26 Jun 2013 01:04:47 +0800
Subject: New version.


diff --git a/.gitignore b/.gitignore
index 2f6ddb9..03af923 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /youtube-dl-2013.04.18.tar.gz
 /youtube-dl-2013.05.07.tar.gz
 /youtube-dl-2013.05.23.tar.gz
+/youtube-dl-2013.06.31.tar.gz
diff --git a/sources b/sources
index bdb6273..4b3dedf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
 6cb4ee904456d102d4f3edb68272ca50  youtube-dl-2013.05.23.tar.gz
+83638449553afa6bedce40edc254d182  youtube-dl-2013.06.31.tar.gz
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 75a61d8..053cd02 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2013.05.23
+Version:        2013.06.31
 Release:        1%{?dist}
 Summary:        A small command-line program to download videos from YouTube.com and other sites
 License:        Public Domain
@@ -38,6 +38,9 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Wed Jun 26 2013 Christopher Meng <rpm at cicku.me> - 2013.06.31-1
+- Update to new release.
+
 * Mon Jun 17 2013 Christopher Meng <rpm at cicku.me> - 2013.05.23-1
 - Update to new release and cleanup the spec.
 
-- 
cgit v0.10.2


From e133e75b971ecd805fc94698673a2d1645cf77bf Mon Sep 17 00:00:00 2001
From: root <root at fab.cicku.me>
Date: Tue, 2 Jul 2013 23:02:00 +0800
Subject: New version with modified SPEC.


diff --git a/.gitignore b/.gitignore
index 03af923..7ef9d93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /youtube-dl-2013.05.07.tar.gz
 /youtube-dl-2013.05.23.tar.gz
 /youtube-dl-2013.06.31.tar.gz
+/youtube-dl-2013.07.02.tar.gz
diff --git a/sources b/sources
index 4b3dedf..03cfac6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 139ffe39568318a5939edf05afbac4d0  youtube-dl-2013.05.14.tar.gz
 6cb4ee904456d102d4f3edb68272ca50  youtube-dl-2013.05.23.tar.gz
 83638449553afa6bedce40edc254d182  youtube-dl-2013.06.31.tar.gz
+89f7959dec2a7e669887b509bb101358  youtube-dl-2013.07.02.tar.gz
diff --git a/youtube-dl.spec b/youtube-dl.spec
index 053cd02..4eb935d 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -1,7 +1,7 @@
 Name:           youtube-dl
-Version:        2013.06.31
+Version:        2013.07.02
 Release:        1%{?dist}
-Summary:        A small command-line program to download videos from YouTube.com and other sites
+Summary:        A small command-line program to download online videos
 License:        Public Domain
 URL:            http://youtube-dl.org
 Source0:        http://youtube-dl.org/downloads/%{version}/%{name}-%{version}.tar.gz
@@ -16,28 +16,37 @@ BuildRequires:  python
 Requires:       python
 
 %description
-Small command-line program to download videos from YouTube.
+Small command-line program to download videos from YouTube and other sites.
 
 %prep
-%setup -cqTn %{name}-%{version}
-gzip -dc %{SOURCE0} | tar --strip-components=1 -xvvf -
+%setup -qn %{name}
 
 %build
-make
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" MANDIR="%{_mandir}"
+make install DESTDIR="%{buildroot}" \
+    PREFIX="%{_prefix}" \
+    MANDIR="%{_mandir}" \
+    PYTHON="%{_bindir}/python"
 mkdir -p %{buildroot}%{_sysconfdir}
-install -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}
+install -p -m644 %{S:1} %{buildroot}%{_sysconfdir}
+
+%check
+make test
 
 %files
-%doc CHANGELOG LICENSE
+%doc LICENSE
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Tue Jul 02 2013 Christopher Meng <rpm at cicku.me> - 2013.07.02-1
+- Update to new release.
+- SPEC cleanup.
+
 * Wed Jun 26 2013 Christopher Meng <rpm at cicku.me> - 2013.06.31-1
 - Update to new release.
 
-- 
cgit v0.10.2


From 7aa2771e0908f510f4b44951c64f2659417773ca Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm at cicku.me>
Date: Tue, 2 Jul 2013 23:57:22 +0800
Subject: Fix the tests.


diff --git a/youtube-dl.spec b/youtube-dl.spec
index 4eb935d..228a890 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -13,6 +13,8 @@ BuildRequires:  zip
 # Used to generate manpage
 BuildRequires:  pandoc
 BuildRequires:  python
+#Tests
+BuildRequires:  python-nose
 Requires:       python
 
 %description
-- 
cgit v0.10.2


From cd4add89eba4a770eaaad84154cf3e46f2120c0f Mon Sep 17 00:00:00 2001
From: Christopher Meng <rpm at cicku.me>
Date: Wed, 3 Jul 2013 00:08:10 +0800
Subject: Disable the tests because of no internet connection.


diff --git a/youtube-dl.spec b/youtube-dl.spec
index 228a890..23988fa 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -14,7 +14,7 @@ BuildRequires:  zip
 BuildRequires:  pandoc
 BuildRequires:  python
 #Tests
-BuildRequires:  python-nose
+#BuildRequires:  python-nose
 Requires:       python
 
 %description
@@ -35,7 +35,7 @@ mkdir -p %{buildroot}%{_sysconfdir}
 install -p -m644 %{S:1} %{buildroot}%{_sysconfdir}
 
 %check
-make test
+#make test
 
 %files
 %doc LICENSE
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/youtube-dl.git/commit/?h=f20&id=8b9dedfed3d9d663d80404cf5488af426ca6e9d5
