scm-commits June 2014

scm-commits@lists.fedoraproject.org

462 participants
35398 discussions

[ruby-qt/f20] (11 commits) ...Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

Summary of changes: d4b5b80... 4.12.90 (*) ce76d15... 4.12.95 (*) 5416db0... 4.12.97 (*) a3dbfe8... 4.13.0 (*) aca2b8b... Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 (*) 5f5b00a... 4.13.1 (*) 3a8d504... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) cff3a99... 4.13.2 (*) bae3811... Revert "4.12.5" aa2e33a... Revert "4.12.4" f65457b... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[qyoto/f20: 10/10] Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

commit e69de625c1c3feae67a2687920cbe82de1bc523e Merge: 65a390f 2a37d61 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:43 2014 -0500 Merge branch 'master' into f20 .gitignore | 6 ++++++ qyoto.spec | 23 ++++++++++++++++++++++- sources | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) ---

1 0

[qyoto/f20: 9/10] Revert "4.12.4"
by Rex Dieter 30 Jun '14

30 Jun '14

commit 65a390f98bd49b82c837c0f6635a321f301c3142 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:43 2014 -0500 Revert "4.12.4" This reverts commit 14f3cd94f8f4c4053111f627cd63fe31e2b8afca. .gitignore | 1 - qyoto.spec | 5 +---- sources | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index ebe9828..a547b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /qyoto-4.12.1.tar.xz /qyoto-4.12.2.tar.xz /qyoto-4.12.3.tar.xz -/qyoto-4.12.4.tar.xz diff --git a/qyoto.spec b/qyoto.spec index 556ce61..a127b1f 100644 --- a/qyoto.spec +++ b/qyoto.spec @@ -12,7 +12,7 @@ Name: qyoto Summary: .NET/Mono bindings for the Qt libraries -Version: 4.12.4 +Version: 4.12.3 Release: 1%{?dist} # libqyoto LGPLv2+, mono bindings GPLv2+ @@ -114,9 +114,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog -* Wed Apr 02 2014 Than Ngo <than(a)redhat.com> - 4.12.4-1 -- 4.12.4 - * Sat Mar 01 2014 Rex Dieter <rdieter(a)fedoraproject.org> - 4.12.3-1 - 4.12.3 diff --git a/sources b/sources index 5b46a8d..eeeadfb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -177558d1d939ed13065ed317d178367d qyoto-4.12.4.tar.xz +a9be02a4ed0dadf15e6f0471643440ac qyoto-4.12.3.tar.xz

1 0

[qyoto/f20: 8/10] Revert "4.12.5"
by Rex Dieter 30 Jun '14

30 Jun '14

commit cb509bf1001d134be1317c6736ce93610122c6f1 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:43 2014 -0500 Revert "4.12.5" This reverts commit 7399a9de3531f4473b7be463637090c46b8b3399. .gitignore | 1 - qyoto.spec | 5 +---- sources | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index ec98913..ebe9828 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,3 @@ /qyoto-4.12.2.tar.xz /qyoto-4.12.3.tar.xz /qyoto-4.12.4.tar.xz -/qyoto-4.12.5.tar.xz diff --git a/qyoto.spec b/qyoto.spec index 0fb81f0..556ce61 100644 --- a/qyoto.spec +++ b/qyoto.spec @@ -12,7 +12,7 @@ Name: qyoto Summary: .NET/Mono bindings for the Qt libraries -Version: 4.12.5 +Version: 4.12.4 Release: 1%{?dist} # libqyoto LGPLv2+, mono bindings GPLv2+ @@ -114,9 +114,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog -* Sat Apr 26 2014 Rex Dieter <rdieter(a)fedoraproject.org> - 4.12.5-1 -- 4.12.5 - * Wed Apr 02 2014 Than Ngo <than(a)redhat.com> - 4.12.4-1 - 4.12.4 diff --git a/sources b/sources index 26d193a..5b46a8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee546f1286f206c5ac34bca5e9279b89 qyoto-4.12.5.tar.xz +177558d1d939ed13065ed317d178367d qyoto-4.12.4.tar.xz

1 0

[qyoto/f20] (10 commits) ...Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

Summary of changes: 94a69ab... 4.12.90 (*) 076ed47... 4.12.95 (*) 89e88e9... 4.12.97 (*) 8efa4f0... 4.13.0 (*) 7c0c828... 4.13.1 (*) 6d06175... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 2a37d61... 4.13.2 (*) cb509bf... Revert "4.12.5" 65a390f... Revert "4.12.4" e69de62... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[pykde4/f20: 22/22] Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

commit 9edeecaaf1060e8a3f6862158204e9405ed81fe7 Merge: 9cb6724 8c591af Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:05 2014 -0500 Merge branch 'master' into f20 .gitignore | 10 +-- pykde4-4.12.3-python_library_realpath.patch | 13 ++ pykde4-4.12.3-sip_4_15_5.patch | 12 ++ pykde4-4.13.1-sip416.patch | 14 ++ pykde4.spec | 140 +++++++++++++------- pythonpluginfactory_use_versioned_python_lib.diff | 21 --- sources | 2 +- 7 files changed, 133 insertions(+), 79 deletions(-) ---

1 0

[pykde4/f20: 21/22] Revert "4.12.4"
by Rex Dieter 30 Jun '14

30 Jun '14

commit 9cb67247212d5190cb1cb3fd34ed82c9fbfdeae2 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:05 2014 -0500 Revert "4.12.4" This reverts commit 4691f059fd7f2b77371968067493d3d80f344274. .gitignore | 1 - pykde4.spec | 5 +---- sources | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index de7fbb8..7e9b612 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ /pykde4-4.12.1.tar.xz /pykde4-4.12.2.tar.xz /pykde4-4.12.3.tar.xz -/pykde4-4.12.4.tar.xz diff --git a/pykde4.spec b/pykde4.spec index a68f3da..080d4a7 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -9,7 +9,7 @@ %endif Name: pykde4 -Version: 4.12.4 +Version: 4.12.3 Release: 1%{?dist} Summary: Python bindings for KDE4 @@ -294,9 +294,6 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog -* Wed Apr 02 2014 Than Ngo <than(a)redhat.com> - 4.12.4-1 -- 4.12.4 - * Sat Mar 01 2014 Rex Dieter <rdieter(a)fedoraproject.org> - 4.12.3-1 - 4.12.3 diff --git a/sources b/sources index 1cdf0fb..75ca311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4808c3fa52e1a77dac807dee3a6c6f98 pykde4-4.12.4.tar.xz +58f2b0089a84269c730c98ca48c48c51 pykde4-4.12.3.tar.xz

1 0

[pykde4/f20: 20/22] Revert "4.12.5"
by Rex Dieter 30 Jun '14

30 Jun '14

commit a5a2aa373639bae0c1ce613d7540c5bbe87a1d9e Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:17:05 2014 -0500 Revert "4.12.5" This reverts commit 286c2278f7898c8b63132c460d1df8c912b39c20. .gitignore | 10 +++++++++- pykde4.spec | 5 +---- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 96d223b..de7fbb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ -/pykde4-4.12.5.tar.xz +/pykde4-4.11.3.tar.xz +/pykde4-4.11.90.tar.xz +/pykde4-4.11.95.tar.xz +/pykde4-4.11.97.tar.xz +/pykde4-4.12.0.tar.xz +/pykde4-4.12.1.tar.xz +/pykde4-4.12.2.tar.xz +/pykde4-4.12.3.tar.xz +/pykde4-4.12.4.tar.xz diff --git a/pykde4.spec b/pykde4.spec index 973a43e..a68f3da 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -9,7 +9,7 @@ %endif Name: pykde4 -Version: 4.12.5 +Version: 4.12.4 Release: 1%{?dist} Summary: Python bindings for KDE4 @@ -294,9 +294,6 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog -* Sat Apr 26 2014 Rex Dieter <rdieter(a)fedoraproject.org> 4.12.5-1 -- 4.12.5 - * Wed Apr 02 2014 Than Ngo <than(a)redhat.com> - 4.12.4-1 - 4.12.4 diff --git a/sources b/sources index f6ff5d8..1cdf0fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0ed5f78383645730b67821c613149b6 pykde4-4.12.5.tar.xz +4808c3fa52e1a77dac807dee3a6c6f98 pykde4-4.12.4.tar.xz

1 0

[pykde4/f20] (22 commits) ...Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

Summary of changes: 08de249... simplify python dep (*) ca2bfd7... python_library_realpath.patch (*) f1f9404... 4.12.3-3 (*) 3bee625... typo (*) 6e10545... try to fix phonon-related ftbfs (*) 068cc47... fix %if (*) 1fd1b8c... fix pykdeuic reference in buildroot (*) 427b191... fix applicatiaon of new patch (*) 32eb2be... 4.12.90 (*) d504e92... 4.12.95 (*) 1e037f2... 4.12.97 (*) 03157a5... 4.13.0 (*) a05cf48... 4.13.1 (*) c5dfbb1... new-sources (*) 6a7ce63... rebuild (f21-python) (*) 4e43e4f... rebuild (sip/PyQt4) (*) 6c613da... FTBFS using sip-4.16 (*) ede02a5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*) 8c591af... 4.13.2 (*) a5a2aa3... Revert "4.12.5" 9cb6724... Revert "4.12.4" 9edeeca... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[python-setuptools] Fix a bug in the sdist command
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 72f65d9dc14c37f889a3b42a8d93bc74511a0f60 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:15:36 2014 -0700 Fix a bug in the sdist command python-setuptools.spec | 8 +++++++- setuptools-sdist-postproc.patch | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) --- diff --git a/python-setuptools.spec b/python-setuptools.spec index a5e495b..472dc1c 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -20,7 +20,7 @@ Name: python-setuptools Version: 2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Easily build and distribute Python packages Group: Applications/System @@ -29,6 +29,8 @@ URL: http://pypi.python.org/pypi/%{srcname} Source0: http://pypi.python.org/packages/source/s/%{srcname}/%{srcname}-%{version}.t… Source1: psfl.txt Source2: zpl.txt +# Fixed in upstream using a different method +Patch0: setuptools-sdist-postproc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,6 +95,7 @@ execute the software that requires pkg_resources.py. %prep %setup -q -n %{srcname}-%{version} +%patch0 -p1 find -name '*.txt' -exec chmod -x \{\} \; find . -name '*.orig' -exec rm \{\} \; @@ -204,6 +207,9 @@ rm -rf %{buildroot} %endif # with_python3 %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.0-6 +- Fix a bug in the sdist command + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/setuptools-sdist-postproc.patch b/setuptools-sdist-postproc.patch new file mode 100644 index 0000000..413f511 --- /dev/null +++ b/setuptools-sdist-postproc.patch @@ -0,0 +1,17 @@ +Index: setuptools-2.0/setuptools/command/sdist.py +=================================================================== +--- setuptools-2.0.orig/setuptools/command/sdist.py ++++ setuptools-2.0/setuptools/command/sdist.py +@@ -35,10 +35,10 @@ class re_finder(object): + f.close() + for match in self.pattern.finditer(data): + path = match.group(1) +- if postproc: ++ if self.postproc: + #postproc used to be used when the svn finder + #was an re_finder for calling unescape +- path = postproc(path) ++ path = self.postproc(path) + yield svn_utils.joinpath(dirname,path) + def __call__(self, dirname=''): + path = svn_utils.joinpath(dirname, self.path)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
3540
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2014